Skip to content

Commit

Permalink
Don't enable libcpp for llvm by default.
Browse files Browse the repository at this point in the history
  • Loading branch information
@luqmana
luqmana committed May 29, 2014
1 parent dc5ce0a commit 3b56724
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions configure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,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 libcpp 1 "build with llvm with libc++ instead of libstdc++ when using clang"
opt llvm-assertions 1 "build LLVM with assertions"
opt debug 1 "build with extra debug fun"
opt ratchet-bench 0 "ratchet benchmarks"
Expand Down Expand Up @@ -1136,7 +1136,7 @@ do
CXXFLAGS=$LLVM_CXXFLAGS
LDFLAGS=$LLVM_LDFLAGS

if [ "$CFG_DISABLE_LIBCPP" != 1 ]; then
if [ "$CFG_DISABLE_LIBCPP" != 1 ] && [ "$CFG_USING_CLANG" == 1 ]; then
LLVM_OPTS="$LLVM_OPTS --enable-libcpp"
fi

Expand Down

5 comments on commit 3b56724

@bors
Copy link
Contributor

@bors bors commented on 3b56724 May 29, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at luqmana@3b56724

@bors
Copy link
Contributor

@bors bors commented on 3b56724 May 29, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging luqmana/rust/fc = 3b56724 into auto

@bors
Copy link
Contributor

@bors bors commented on 3b56724 May 29, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

luqmana/rust/fc = 3b56724 merged ok, testing candidate = d35a380

@bors
Copy link
Contributor

@bors bors commented on 3b56724 May 29, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/5982
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/5980
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/5076
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/5084
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/6080
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/5168
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/5176
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/6082
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/5167
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/5173
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/5233
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/2969
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/6072
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/5168
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/5183

@bors
Copy link
Contributor

@bors bors commented on 3b56724 May 29, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = d35a380

Please sign in to comment.