diff options
| author | Bob Wilson <bob.wilson@apple.com> | 2012-09-24 22:51:19 +0000 |
|---|---|---|
| committer | Bob Wilson <bob.wilson@apple.com> | 2012-09-24 22:51:19 +0000 |
| commit | c9d0c7094183285a0c3da852d8ed513d2a459d6d (patch) | |
| tree | f4a5a4d4447659a6cbbbd04884ccef903b630172 /Makefile | |
| parent | 3dbefbd9bb9801db3b8fda8e15d03f2659393135 (diff) | |
| download | llvm-c9d0c7094183285a0c3da852d8ed513d2a459d6d.tar.gz llvm-c9d0c7094183285a0c3da852d8ed513d2a459d6d.tar.bz2 llvm-c9d0c7094183285a0c3da852d8ed513d2a459d6d.tar.xz | |
Clear UNIVERSAL_SDK_PATH setting when building host tools. <rdar://12360497>
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
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -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) \ |