Skip to content

Commit

Permalink
Revert "Use a special path to place the .o files in."
Browse files Browse the repository at this point in the history
This reverts commit 165428 in an attempt to get our buildbots going.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@165574 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
bob-wilson committed Oct 9, 2012
1 parent 7208fae commit 52bcafe
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
3 changes: 1 addition & 2 deletions Makefile.rules
Original file line number Diff line number Diff line change
Expand Up @@ -645,8 +645,7 @@ else
LD.Flags += $(RPATH) -Wl,@executable_path/../lib
endif
ifeq ($(RC_BUILDIT),YES)
ObjDir := $(shell mkdir -p ${OBJROOT}/dSYMs)
TempFile := $(shell mktemp ${ObjDir}/llvm-lto.XXXXXX)
TempFile := $(shell mktemp ${OBJROOT}/llvm-lto.XXXXXX)
LD.Flags += -Wl,-object_path_lto -Wl,$(TempFile)
endif
endif
Expand Down
3 changes: 1 addition & 2 deletions runtime/libprofile/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@ ifeq ($(HOST_OS),Darwin)

# If we're doing an Apple-style build, add the LTO object path.
ifeq ($(RC_BUILDIT),YES)
ObjDir := $(shell mkdir -p ${OBJROOT}/dSYMs)
TempFile := $(shell mktemp ${ObjDir}/profile_rt-lto.XXXXXX)
TempFile = $(shell mktemp ${OBJROOT}/profile_rt-lto.XXXXXX)
LLVMLibsOptions := $(LLVMLibsOptions) \
-Wl,-object_path_lto -Wl,$(TempFile)
endif
Expand Down
3 changes: 1 addition & 2 deletions tools/lto/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@ ifeq ($(HOST_OS),Darwin)

# If we're doing an Apple-style build, add the LTO object path.
ifeq ($(RC_BUILDIT),YES)
ObjDir := $(shell mkdir -p ${OBJROOT}/dSYMs)
TempFile := $(shell mktemp ${ObjDir}/llvm-lto.XXXXXX)
TempFile = $(shell mktemp ${OBJROOT}/llvm-lto.XXXXXX)
LLVMLibsOptions := $(LLVMLibsOptions) \
-Wl,-object_path_lto -Wl,$(TempFile)
endif
Expand Down

0 comments on commit 52bcafe

Please sign in to comment.