[llvm-commits] [llvm] r95028 - /llvm/trunk/tools/ed/Makefile

Sean Callanan scallanan at apple.com
Mon Feb 1 15:27:58 PST 2010


Author: spyffe
Date: Mon Feb  1 17:27:57 2010
New Revision: 95028

URL: http://llvm.org/viewvc/llvm-project?rev=95028&view=rev
Log:
Fix for builds with separate source and build
directories (like, oh, say, any multistage build)

Modified:
    llvm/trunk/tools/ed/Makefile

Modified: llvm/trunk/tools/ed/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/ed/Makefile?rev=95028&r1=95027&r2=95028&view=diff

==============================================================================
--- llvm/trunk/tools/ed/Makefile (original)
+++ llvm/trunk/tools/ed/Makefile Mon Feb  1 17:27:57 2010
@@ -34,7 +34,7 @@
     # 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 @@
 	$(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::





More information about the llvm-commits mailing list