From 8fd10ef0d6eb6fcc3990aba1621edb528640fff8 Mon Sep 17 00:00:00 2001 From: Bob Wilson Date: Tue, 9 Oct 2012 23:59:01 +0000 Subject: [PATCH] Revert "Use a special path to place the .o files in." This reverts commit 165428 in an attempt to get our buildbots going. llvm-svn: 165574 --- llvm/Makefile.rules | 3 +-- llvm/runtime/libprofile/Makefile | 3 +-- llvm/tools/lto/Makefile | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/llvm/Makefile.rules b/llvm/Makefile.rules index ddf4d33..a52bb80 100644 --- a/llvm/Makefile.rules +++ b/llvm/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/llvm/runtime/libprofile/Makefile b/llvm/runtime/libprofile/Makefile index e9b220c..1ea0895 100644 --- a/llvm/runtime/libprofile/Makefile +++ b/llvm/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/llvm/tools/lto/Makefile b/llvm/tools/lto/Makefile index 4a468de..3e7621f 100644 --- a/llvm/tools/lto/Makefile +++ b/llvm/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 -- 2.7.4