From 612cb6ef2b49f20f406484a4473849fd02c37e62 Mon Sep 17 00:00:00 2001 From: Jason Molenda Date: Sat, 23 Nov 2013 04:59:07 +0000 Subject: Add --enable-cxx11 to llvm builds. As of r195239, SmallPtrSet.h / SmallPtrSet.cpp use different methods if SmallPtrSet.h is included in C++11 mode. Building llvm in C++03 mode and lldb in C++11 mode resulted in a link-time failure with the C++11-mode-specific method not being found in the llvm build. llvm-svn: 195544 --- lldb/scripts/build-llvm.pl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lldb') diff --git a/lldb/scripts/build-llvm.pl b/lldb/scripts/build-llvm.pl index 8b7fa052a86..38f75457cce 100644 --- a/lldb/scripts/build-llvm.pl +++ b/lldb/scripts/build-llvm.pl @@ -33,11 +33,11 @@ my $original_env_path = $ENV{PATH}; my $common_configure_options = "--disable-terminfo"; our %llvm_config_info = ( - 'Debug' => { configure_options => '--disable-optimized --disable-assertions --enable-libcpp', make_options => 'DEBUG_SYMBOLS=1'}, - 'Debug+Asserts' => { configure_options => '--disable-optimized --enable-assertions --enable-libcpp' , make_options => 'DEBUG_SYMBOLS=1'}, - 'Release' => { configure_options => '--enable-optimized --disable-assertions --enable-libcpp' , make_options => ''}, - 'Release+Debug' => { configure_options => '--enable-optimized --disable-assertions --enable-libcpp' , make_options => 'DEBUG_SYMBOLS=1'}, - 'Release+Asserts' => { configure_options => '--enable-optimized --enable-assertions --enable-libcpp' , make_options => ''}, + 'Debug' => { configure_options => '--disable-optimized --disable-assertions --enable-cxx11 --enable-libcpp', make_options => 'DEBUG_SYMBOLS=1'}, + 'Debug+Asserts' => { configure_options => '--disable-optimized --enable-assertions --enable-cxx11 --enable-libcpp' , make_options => 'DEBUG_SYMBOLS=1'}, + 'Release' => { configure_options => '--enable-optimized --disable-assertions --enable-cxx11 --enable-libcpp' , make_options => ''}, + 'Release+Debug' => { configure_options => '--enable-optimized --disable-assertions --enable-cxx11 --enable-libcpp' , make_options => 'DEBUG_SYMBOLS=1'}, + 'Release+Asserts' => { configure_options => '--enable-optimized --enable-assertions --enable-cxx11 --enable-libcpp' , make_options => ''}, ); our $llvm_config_href = undef; -- cgit v1.2.3