maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Updated to build against the latest LLVM release. 

Also fixed our build to define NDEBUG; code that
uses LLVM headers without NDEBUG is
binary-incompatible with libraries built with
NDEBUG.

llvm-svn: 107853
This commit is contained in:
Sean Callanan 2010-07-08 02:13:18 +00:00
parent 25f9364cbd
commit 6015095608
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lldb/lldb.xcodeproj/project.pbxproj
View File

@ -2753,8 +2753,9 @@
"$(LLVM_BUILD_DIR)", "$(LLVM_BUILD_DIR)",
); );
LLVM_BUILD_DIR = "$(SRCROOT)/llvm"; LLVM_BUILD_DIR = "$(SRCROOT)/llvm";
LLVM_CONFIGURATION = Debug; LLVM_CONFIGURATION = Release;
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"-DNDEBUG",
"-DFOR_DYLD=0", "-DFOR_DYLD=0",
"-DSUPPORT_REMOTE_UNWINDING", "-DSUPPORT_REMOTE_UNWINDING",
"-Wparentheses", "-Wparentheses",
@ -2808,6 +2809,7 @@
LLVM_BUILD_DIR = "$(SRCROOT)/llvm"; LLVM_BUILD_DIR = "$(SRCROOT)/llvm";
LLVM_CONFIGURATION = Release; LLVM_CONFIGURATION = Release;
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"-DNDEBUG",
"-DFOR_DYLD=0", "-DFOR_DYLD=0",
"-DSUPPORT_REMOTE_UNWINDING", "-DSUPPORT_REMOTE_UNWINDING",
"-Wparentheses", "-Wparentheses",
@ -2917,6 +2919,7 @@
LLVM_BUILD_DIR = "$(DERIVED_FILE_DIR)/llvm.build"; LLVM_BUILD_DIR = "$(DERIVED_FILE_DIR)/llvm.build";
LLVM_CONFIGURATION = Release; LLVM_CONFIGURATION = Release;
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"-DNDEBUG",
"-DFOR_DYLD=0", "-DFOR_DYLD=0",
"-DSUPPORT_REMOTE_UNWINDING", "-DSUPPORT_REMOTE_UNWINDING",
"-Wparentheses", "-Wparentheses",

4
lldb/scripts/build-llvm.pl
View File

@ -25,7 +25,7 @@ our @llvm_clang_slices; # paths to the single architecture static libraries (arc
our $llvm_configuration = $ENV{LLVM_CONFIGURATION}; our $llvm_configuration = $ENV{LLVM_CONFIGURATION};
our $llvm_revision = "'{2010-07-02T08:00}'"; our $llvm_revision = "'{2010-07-07T08:00}'";
our $llvm_source_dir = "$ENV{SRCROOT}"; our $llvm_source_dir = "$ENV{SRCROOT}";
our $cc = "$ENV{DEVELOPER_BIN_DIR}/gcc-4.2"; our $cc = "$ENV{DEVELOPER_BIN_DIR}/gcc-4.2";
our $cxx = "$ENV{DEVELOPER_BIN_DIR}/g++-4.2"; our $cxx = "$ENV{DEVELOPER_BIN_DIR}/g++-4.2";
@ -225,7 +225,7 @@ sub build_llvm
# Build llvm and clang # Build llvm and clang
print "Configuring clang ($arch) in '$llvm_dstroot_arch'...\n"; print "Configuring clang ($arch) in '$llvm_dstroot_arch'...\n";
my $lldb_configuration_options = ''; my $lldb_configuration_options = '';
$llvm_configuration eq 'Release' and $lldb_configuration_options .= '--enable-optimized'; $llvm_configuration eq 'Release' and $lldb_configuration_options .= '--enable-optimized --disable-assertions';
do_command ("cd '$llvm_dstroot_arch' && '$llvm_source_dir/llvm/configure' $lldb_configuration_options --enable-targets=x86,x86_64,arm --build=$arch-apple-darwin10 CC=\"$cc -arch $arch\" CXX=\"$cxx -arch $arch\"", do_command ("cd '$llvm_dstroot_arch' && '$llvm_source_dir/llvm/configure' $lldb_configuration_options --enable-targets=x86,x86_64,arm --build=$arch-apple-darwin10 CC=\"$cc -arch $arch\" CXX=\"$cxx -arch $arch\"",
"configuring llvm build", 1); "configuring llvm build", 1);
} }