From: Sean Callanan <scallanan@apple.com>
Date: Mon, 1 Feb 2010 23:27:57 +0000 (+0000)
Subject: Fix for builds with separate source and build
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=54c7788e99b38152896675a080d28c0b2426e346;p=oota-llvm.git

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
---

diff --git a/tools/ed/Makefile b/tools/ed/Makefile
index b5ec476f731..23970a9cae4 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::