summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorSean Callanan <scallanan@apple.com>2010-02-01 23:27:57 +0000
committerSean Callanan <scallanan@apple.com>2010-02-01 23:27:57 +0000
commit54c7788e99b38152896675a080d28c0b2426e346 (patch)
tree276f5efbff3ea4df3799a47107b078a27ffeddbb /tools
parent6ddf0430e1497e3bd02d9fe41dcab65954c3b177 (diff)
downloadllvm-54c7788e99b38152896675a080d28c0b2426e346.tar.gz
llvm-54c7788e99b38152896675a080d28c0b2426e346.tar.bz2
llvm-54c7788e99b38152896675a080d28c0b2426e346.tar.xz
Fix for builds with separate source and build
directories (like, oh, say, any multistage build) git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@95028 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools')
-rw-r--r--tools/ed/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/ed/Makefile b/tools/ed/Makefile
index b5ec476f73..23970a9cae 100644
--- a/tools/ed/Makefile
+++ b/tools/ed/Makefile
@@ -34,7 +34,7 @@ ifeq ($(HOST_OS),Darwin)
# extra options to override libtool defaults
LLVMLibsOptions := $(LLVMLibsOptions) \
-avoid-version \
- -Wl,-exported_symbols_list -Wl,$(PROJ_SRC_DIR)/EnhancedDisassembly.exports \
+ -Wl,-exported_symbols_list -Wl,EnhancedDisassembly.exports \
-Wl,-dead_strip \
-Wl,-seg1addr -Wl,0xE0000000
@@ -55,11 +55,11 @@ EnhancedDisassembly.exports: EnhancedDisassembly.exports.noblocks EnhancedDisass
$(Echo) "Copying exports file"
ifeq ($(HOST_OS),Darwin)
$(Verb) if [ $(DARWIN_VERS) -ge 10 ] ; \
- then $(CP) -f EnhancedDisassembly.exports.blocks EnhancedDisassembly.exports ; \
- else $(CP) -f EnhancedDisassembly.exports.noblocks EnhancedDisassembly.exports ; \
+ then $(CP) -f $(PROJ_SRC_DIR)/EnhancedDisassembly.exports.blocks EnhancedDisassembly.exports ; \
+ else $(CP) -f $(PROJ_SRC_DIR)/EnhancedDisassembly.exports.noblocks EnhancedDisassembly.exports ; \
fi
else
- $(Verb) $(CP) -f EnhancedDisassembly.exports.noblocks EnhancedDisassembly.exports
+ $(Verb) $(CP) -f $(PROJ_SRC_DIR)/EnhancedDisassembly.exports.noblocks EnhancedDisassembly.exports
endif
clean::