Revert "Use a special path to place the .o files in."

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

diff --git a/Makefile.rules b/Makefile.rules
index ddf4d33d2f88482ce3df9b49b85c001791f6e10d..a52bb8029dc790c0e949378c99d8ece130e0a7f2 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -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

diff --git a/runtime/libprofile/Makefile b/runtime/libprofile/Makefile
index e9b220cf2ff0ecff833c3768fd5e988ece43969e..1ea08953387f932377e6cca2a6d9ec0dc6cdbcd6 100644 (file)
--- a/runtime/libprofile/Makefile
+++ b/runtime/libprofile/Makefile
@@ -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

diff --git a/tools/lto/Makefile b/tools/lto/Makefile
index 4a468dedf59f91fe23aebe75d2fe2120415885de..3e7621f6dbf4ac3fa56fb660f6d0f00306475403 100644 (file)
--- a/tools/lto/Makefile
+++ b/tools/lto/Makefile
@@ -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