Permalink
Browse files

Clear UNIVERSAL_SDK_PATH setting when building host tools. <rdar://12…

…360497>

I also moved the SDKROOT setting into the make flags, since clearing it from
the environment isn't good enough to override a setting on the make command
line.  That hasn't been a problem but it could be, and it's good to be
consistent with the way UNIVERSAL_SDK_PATH is handled.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@164565 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information...
1 parent 3dbefbd commit c9d0c7094183285a0c3da852d8ed513d2a459d6d @bob-wilson bob-wilson committed Sep 24, 2012
Showing with 4 additions and 2 deletions.
  1. +4 −2 Makefile
View
@@ -112,15 +112,17 @@ cross-compile-build-tools:
unset CFLAGS ; \
unset CXXFLAGS ; \
unset SDKROOT ; \
+ unset UNIVERSAL_SDK_PATH ; \
$(PROJ_SRC_DIR)/configure --build=$(BUILD_TRIPLE) \
--host=$(BUILD_TRIPLE) --target=$(BUILD_TRIPLE) \
--disable-polly ; \
cd .. ; \
fi; \
- (unset SDKROOT; \
- $(MAKE) -C BuildTools \
+ ($(MAKE) -C BuildTools \
BUILD_DIRS_ONLY=1 \
UNIVERSAL= \
+ UNIVERSAL_SDK_PATH= \
+ SDKROOT= \
TARGET_NATIVE_ARCH="$(TARGET_NATIVE_ARCH)" \
TARGETS_TO_BUILD="$(TARGETS_TO_BUILD)" \
ENABLE_OPTIMIZED=$(ENABLE_OPTIMIZED) \

0 comments on commit c9d0c70

Please sign in to comment.