1
0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-22 18:54:02 +01:00

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.

llvm-svn: 164565
This commit is contained in:
Bob Wilson 2012-09-24 22:51:19 +00:00
parent 74f862b349
commit f79469d5fc

View File

@ -112,15 +112,17 @@ cross-compile-build-tools:
unset CFLAGS ; \ unset CFLAGS ; \
unset CXXFLAGS ; \ unset CXXFLAGS ; \
unset SDKROOT ; \ unset SDKROOT ; \
unset UNIVERSAL_SDK_PATH ; \
$(PROJ_SRC_DIR)/configure --build=$(BUILD_TRIPLE) \ $(PROJ_SRC_DIR)/configure --build=$(BUILD_TRIPLE) \
--host=$(BUILD_TRIPLE) --target=$(BUILD_TRIPLE) \ --host=$(BUILD_TRIPLE) --target=$(BUILD_TRIPLE) \
--disable-polly ; \ --disable-polly ; \
cd .. ; \ cd .. ; \
fi; \ fi; \
(unset SDKROOT; \ ($(MAKE) -C BuildTools \
$(MAKE) -C BuildTools \
BUILD_DIRS_ONLY=1 \ BUILD_DIRS_ONLY=1 \
UNIVERSAL= \ UNIVERSAL= \
UNIVERSAL_SDK_PATH= \
SDKROOT= \
TARGET_NATIVE_ARCH="$(TARGET_NATIVE_ARCH)" \ TARGET_NATIVE_ARCH="$(TARGET_NATIVE_ARCH)" \
TARGETS_TO_BUILD="$(TARGETS_TO_BUILD)" \ TARGETS_TO_BUILD="$(TARGETS_TO_BUILD)" \
ENABLE_OPTIMIZED=$(ENABLE_OPTIMIZED) \ ENABLE_OPTIMIZED=$(ENABLE_OPTIMIZED) \