diff options
| author | Greg Clayton <gclayton@apple.com> | 2013-01-16 01:27:32 +0000 |
|---|---|---|
| committer | Greg Clayton <gclayton@apple.com> | 2013-01-16 01:27:32 +0000 |
| commit | d393ca9fb8cb8a3317b43a54d103c3d3f950d3fd (patch) | |
| tree | abb91ed1b5aa92a9172e357cce9c0f0e9e2cc1ce | |
| parent | c60437fb89fee2bd595887ae5346938b62c53a71 (diff) | |
| download | bcm5719-llvm-d393ca9fb8cb8a3317b43a54d103c3d3f950d3fd.tar.gz bcm5719-llvm-d393ca9fb8cb8a3317b43a54d103c3d3f950d3fd.zip | |
SDKROOT should only be unset/cleared for ARM builds. The first fix by Bob Wilson removed it for ARM for both configure and make, but only unset it for desktop configure, not for the make. My next fix unset/cleared it all the time. This fix only unset/clears it for ARM builds.
llvm-svn: 172593
| -rw-r--r-- | lldb/scripts/build-llvm.pl | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/lldb/scripts/build-llvm.pl b/lldb/scripts/build-llvm.pl index 26443760b93..66020516904 100644 --- a/lldb/scripts/build-llvm.pl +++ b/lldb/scripts/build-llvm.pl @@ -248,8 +248,17 @@ sub build_llvm { $lldb_configuration_options .= " --build=$arch-apple-darwin${os_release}"; } - do_command ("cd '$llvm_dstroot_arch' && unset SDKROOT && '$llvm_srcroot/configure' $lldb_configuration_options", - "configuring llvm build", 1); + if ($is_arm) + { + # Unset "SDKROOT" for ARM builds + do_command ("cd '$llvm_dstroot_arch' && unset SDKROOT && '$llvm_srcroot/configure' $lldb_configuration_options", + "configuring llvm build", 1); + } + else + { + do_command ("cd '$llvm_dstroot_arch' && '$llvm_srcroot/configure' $lldb_configuration_options", + "configuring llvm build", 1); + } } if ($do_make) @@ -260,10 +269,10 @@ sub build_llvm my $extra_make_flags = ''; if ($is_arm) { - $extra_make_flags = "UNIVERSAL=1 UNIVERSAL_ARCH=${arch} UNIVERSAL_SDK_PATH='$ENV{SDKROOT}'"; + $extra_make_flags = "UNIVERSAL=1 UNIVERSAL_ARCH=${arch} UNIVERSAL_SDK_PATH='$ENV{SDKROOT}' SDKROOT="; } - do_command ("cd '$llvm_dstroot_arch' && unset SDKROOT && make -j$num_cpus clang-only VERBOSE=1 $llvm_config_href->{make_options} NO_RUNTIME_LIBS=1 PROJECT_NAME='llvm' $extra_make_flags", "making llvm and clang", 1); - do_command ("cd '$llvm_dstroot_arch' && unset SDKROOT && make -j$num_cpus tools-only VERBOSE=1 $llvm_config_href->{make_options} NO_RUNTIME_LIBS=1 PROJECT_NAME='llvm' $extra_make_flags EDIS_VERSION=1", "making libedis", 1); + do_command ("cd '$llvm_dstroot_arch' && make -j$num_cpus clang-only VERBOSE=1 $llvm_config_href->{make_options} NO_RUNTIME_LIBS=1 PROJECT_NAME='llvm' $extra_make_flags", "making llvm and clang", 1); + do_command ("cd '$llvm_dstroot_arch' && make -j$num_cpus tools-only VERBOSE=1 $llvm_config_href->{make_options} NO_RUNTIME_LIBS=1 PROJECT_NAME='llvm' $extra_make_flags EDIS_VERSION=1", "making libedis", 1); # Combine all .o files from a bunch of static libraries from llvm # and clang into a single .a file. create_single_llvm_archive_for_arch ($llvm_dstroot_arch, 1); |
