diff options
| author | Derek Schuff <dschuff@chromium.org> | 2012-10-12 16:24:16 -0700 |
|---|---|---|
| committer | Derek Schuff <dschuff@chromium.org> | 2012-10-12 16:24:16 -0700 |
| commit | 5eceb0e04023bffa93f5683f356c09e35f9f4f43 (patch) | |
| tree | 07d52d1eaf89a4b4544b48322dcdbc4f65b102d4 /Makefile.rules | |
| parent | 4db6bb7837c58641c4416e87643833bca4945841 (diff) | |
| parent | 40573998821fde7ffeabe8507f4c9e8c7cf762f6 (diff) | |
Merge commit '40573998821fde7ffeabe8507f4c9e8c7cf762f6'
Conflicts:
include/llvm/MC/MCAssembler.h
lib/Target/ARM/ARMISelLowering.cpp
lib/Target/X86/X86TargetMachine.h
tools/llc/llc.cpp
Diffstat (limited to 'Makefile.rules')
| -rw-r--r-- | Makefile.rules | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile.rules b/Makefile.rules index 49bdbe2a23..4edf401f8d 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 mkdir -p ${OBJROOT}/dSYMs ; mktemp ${OBJROOT}/dSYMs/llvm-lto.XXXXXX) LD.Flags += -Wl,-object_path_lto -Wl,$(TempFile) endif endif |