From 52bcafe4bfaf27524bf6575ec397e918d13ec6ce Mon Sep 17 00:00:00 2001 From: Bob Wilson Date: Tue, 9 Oct 2012 23:59:01 +0000 Subject: 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 --- Makefile.rules | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Makefile.rules') diff --git a/Makefile.rules b/Makefile.rules index ddf4d33d2f..a52bb8029d 100644 --- 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 -- cgit v1.2.3-18-g5258 From c33b9304dada40806f875b482d003b5c7b8f9c22 Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Wed, 10 Oct 2012 05:29:15 +0000 Subject: Place temporary LTO files into their own subdirectory. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@165599 91177308-0d34-0410-b5e6-96231b3b80d8 --- Makefile.rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile.rules') diff --git a/Makefile.rules b/Makefile.rules index a52bb8029d..b929ffea59 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -645,7 +645,7 @@ else LD.Flags += $(RPATH) -Wl,@executable_path/../lib endif ifeq ($(RC_BUILDIT),YES) - TempFile := $(shell mktemp ${OBJROOT}/llvm-lto.XXXXXX) + TempFile := $(shell mkdir -p ${OBJROOT}/dSYMs ; mktemp ${OBJROOT}/dSYMs/llvm-lto.XXXXXX) LD.Flags += -Wl,-object_path_lto -Wl,$(TempFile) endif endif -- cgit v1.2.3-18-g5258