[Lldb-commits] [lldb] r172582 - /lldb/trunk/scripts/build-llvm.pl

[Greg Clayton]

Author: gclayton
Date: Tue Jan 15 18:41:14 2013
New Revision: 172582

URL: http://llvm.org/viewvc/llvm-project?rev=172582&view=rev
Log:
Fix clang builds that were broken due to SDKROOT changes of you have an internal OS build.


Modified:
    lldb/trunk/scripts/build-llvm.pl

Modified: lldb/trunk/scripts/build-llvm.pl
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/build-llvm.pl?rev=172582&r1=172581&r2=172582&view=diff
==============================================================================
--- lldb/trunk/scripts/build-llvm.pl (original)
+++ lldb/trunk/scripts/build-llvm.pl Tue Jan 15 18:41:14 2013
@@ -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);