[llvm-commits] [llvm] r165574 - in /llvm/trunk: Makefile.rules runtime/libprofile/Makefile tools/lto/Makefile

[Bob Wilson]

Author: bwilson
Date: Tue Oct  9 18:59:01 2012
New Revision: 165574

URL: http://llvm.org/viewvc/llvm-project?rev=165574&view=rev
Log:
Revert "Use a special path to place the .o files in."

This reverts commit 165428 in an attempt to get our buildbots going.

Modified:
    llvm/trunk/Makefile.rules
    llvm/trunk/runtime/libprofile/Makefile
    llvm/trunk/tools/lto/Makefile

Modified: llvm/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile.rules?rev=165574&r1=165573&r2=165574&view=diff
==============================================================================
--- llvm/trunk/Makefile.rules (original)
+++ llvm/trunk/Makefile.rules Tue Oct  9 18:59:01 2012
@@ -645,8 +645,7 @@
     LD.Flags += $(RPATH) -Wl, at 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

Modified: llvm/trunk/runtime/libprofile/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/runtime/libprofile/Makefile?rev=165574&r1=165573&r2=165574&view=diff
==============================================================================
--- llvm/trunk/runtime/libprofile/Makefile (original)
+++ llvm/trunk/runtime/libprofile/Makefile Tue Oct  9 18:59:01 2012
@@ -51,8 +51,7 @@
 
     # 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

Modified: llvm/trunk/tools/lto/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lto/Makefile?rev=165574&r1=165573&r2=165574&view=diff
==============================================================================
--- llvm/trunk/tools/lto/Makefile (original)
+++ llvm/trunk/tools/lto/Makefile Tue Oct  9 18:59:01 2012
@@ -52,8 +52,7 @@
 
     # 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