From: Bill Wendling Date: Wed, 13 Feb 2013 19:44:08 +0000 (+0000) Subject: Use 'RC_XBS' instead of 'RC_BUILDIT' to catch all times when it's built in the Apple... X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ee740ddf9d8248e39032567dc22766b0f8b45cd6;p=oota-llvm.git Use 'RC_XBS' instead of 'RC_BUILDIT' to catch all times when it's built in the Apple way. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@175069 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/Makefile.rules b/Makefile.rules index 2f566eeb923..c737965d09e 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -656,7 +656,7 @@ else ifneq ($(DARWIN_MAJVERS),4) LD.Flags += $(RPATH) -Wl,@executable_path/../lib endif - ifeq ($(RC_BUILDIT),YES) + ifeq ($(RC_XBS),YES) TempFile := $(shell mkdir -p ${OBJROOT}/dSYMs ; mktemp ${OBJROOT}/dSYMs/llvm-lto.XXXXXX) LD.Flags += -Wl,-object_path_lto -Wl,$(TempFile) endif diff --git a/runtime/libprofile/Makefile b/runtime/libprofile/Makefile index 6e9225382a9..44ea204bcf5 100644 --- a/runtime/libprofile/Makefile +++ b/runtime/libprofile/Makefile @@ -50,7 +50,7 @@ ifeq ($(HOST_OS),Darwin) endif # If we're doing an Apple-style build, add the LTO object path. - ifeq ($(RC_BUILDIT),YES) + ifeq ($(RC_XBS),YES) TempFile := $(shell mkdir -p ${OBJROOT}/dSYMs ; mktemp ${OBJROOT}/dSYMs/profile_rt-lto.XXXXXX) LLVMLibsOptions := $(LLVMLibsOptions) \ -Wl,-object_path_lto -Wl,$(TempFile) diff --git a/tools/lto/Makefile b/tools/lto/Makefile index 3610fed03ba..ab2e16e5fab 100644 --- a/tools/lto/Makefile +++ b/tools/lto/Makefile @@ -51,7 +51,7 @@ ifeq ($(HOST_OS),Darwin) endif # If we're doing an Apple-style build, add the LTO object path. - ifeq ($(RC_BUILDIT),YES) + ifeq ($(RC_XBS),YES) TempFile := $(shell mkdir -p ${OBJROOT}/dSYMs ; mktemp ${OBJROOT}/dSYMs/llvm-lto.XXXXXX) LLVMLibsOptions := $(LLVMLibsOptions) \ -Wl,-object_path_lto -Wl,$(TempFile)