Fix clang builds that were broken due to SDKROOT changes of you have an internal OS build.
git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@172582 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/scripts/build-llvm.pl b/scripts/build-llvm.pl
index e66dd92..2644376 100644
--- a/scripts/build-llvm.pl
+++ b/scripts/build-llvm.pl
@@ -260,10 +260,10 @@
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);