diff options
| author | Greg Clayton <gclayton@apple.com> | 2013-01-16 00:41:14 +0000 |
|---|---|---|
| committer | Greg Clayton <gclayton@apple.com> | 2013-01-16 00:41:14 +0000 |
| commit | b02cb40c1882f2b3c375add5aab4ef9b75816249 (patch) | |
| tree | 6b1640f97dc005a91a68f2fcbaa471f99cb57685 /lldb/scripts | |
| parent | 9aa10443ae091e2fe6820b7321694d46dce03db5 (diff) | |
| download | bcm5719-llvm-b02cb40c1882f2b3c375add5aab4ef9b75816249.tar.gz bcm5719-llvm-b02cb40c1882f2b3c375add5aab4ef9b75816249.zip | |
Fix clang builds that were broken due to SDKROOT changes of you have an internal OS build.
llvm-svn: 172582
Diffstat (limited to 'lldb/scripts')
| -rw-r--r-- | lldb/scripts/build-llvm.pl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lldb/scripts/build-llvm.pl b/lldb/scripts/build-llvm.pl index e66dd925625..26443760b93 100644 --- a/lldb/scripts/build-llvm.pl +++ b/lldb/scripts/build-llvm.pl @@ -260,10 +260,10 @@ sub build_llvm my $extra_make_flags = ''; if ($is_arm) { - $extra_make_flags = "UNIVERSAL=1 UNIVERSAL_ARCH=${arch} UNIVERSAL_SDK_PATH='$ENV{SDKROOT}' SDKROOT="; + $extra_make_flags = "UNIVERSAL=1 UNIVERSAL_ARCH=${arch} UNIVERSAL_SDK_PATH='$ENV{SDKROOT}'"; } - 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); + 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); # 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); |
