diff options
| author | Richo Healey <richo@psych0tik.net> | 2014-05-27 23:32:07 -0700 |
|---|---|---|
| committer | Richo Healey <richo@psych0tik.net> | 2014-05-27 23:36:36 -0700 |
| commit | 2a63e44f120e5ef7d0d47758618dd520c3001078 (patch) | |
| tree | 1e7e255313087ed7a1df6d4c46d31ad85d25a3e2 | |
| parent | 73dac7e4e61aa88cfc98433b61ba131b38af978d (diff) | |
| download | rust-2a63e44f120e5ef7d0d47758618dd520c3001078.tar.gz rust-2a63e44f120e5ef7d0d47758618dd520c3001078.zip | |
configure: Move clang's libcpp out into flag
| -rwxr-xr-x | configure | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/configure b/configure index f4cac4cbe85..908daec5ab7 100755 --- a/configure +++ b/configure @@ -401,6 +401,7 @@ opt optimize 1 "build optimized rust code" opt optimize-cxx 1 "build optimized C++ code" opt optimize-llvm 1 "build optimized LLVM" opt optimize-tests 1 "build tests with optimizations" +opt libcpp 1 "build with clang's libcpp" opt llvm-assertions 1 "build LLVM with assertions" opt debug 1 "build with extra debug fun" opt ratchet-bench 0 "ratchet benchmarks" @@ -1047,7 +1048,6 @@ do LLVM_CXX_64="ccache clang++ -Qunused-arguments" LLVM_CC_64="ccache clang -Qunused-arguments" - LLVM_OPTS="$LLVM_OPTS --enable-libcpp" ;; ("clang") LLVM_CXX_32="clang++ -m32 -Qunused-arguments" @@ -1055,7 +1055,6 @@ do LLVM_CXX_64="clang++ -Qunused-arguments" LLVM_CC_64="clang -Qunused-arguments" - LLVM_OPTS="$LLVM_OPTS --enable-libcpp" ;; ("ccache gcc") LLVM_CXX_32="ccache g++ -m32" @@ -1111,6 +1110,10 @@ do CXXFLAGS=$LLVM_CXXFLAGS LDFLAGS=$LLVM_LDFLAGS + if [ "$CFG_DISABLE_LIBCPP" != 1 ]; then + LLVM_OPTS="$LLVM_OPTS --enable-libcpp" + fi + LLVM_FLAGS="$LLVM_TARGETS $LLVM_OPTS $LLVM_BUILD \ $LLVM_HOST $LLVM_TARGET --with-python=$CFG_PYTHON" |