[llvm-commits] [llvm] r101414 - in /llvm/trunk: Makefile.rules runtime/libprofile/Makefile tools/edis/Makefile tools/lto/Makefile

[Dan Gohman]

Author: djg
Date: Thu Apr 15 18:08:00 2010
New Revision: 101414

URL: http://llvm.org/viewvc/llvm-project?rev=101414&view=rev
Log:
Make the export files absolute paths, and change Makefile.rules
to expect them this way, to fix srcdir!=objdir builds.

Modified:
    llvm/trunk/Makefile.rules
    llvm/trunk/runtime/libprofile/Makefile
    llvm/trunk/tools/edis/Makefile
    llvm/trunk/tools/lto/Makefile

Modified: llvm/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile.rules?rev=101414&r1=101413&r2=101414&view=diff
==============================================================================
--- llvm/trunk/Makefile.rules (original)
+++ llvm/trunk/Makefile.rules Thu Apr 15 18:08:00 2010
@@ -978,7 +978,7 @@
 
 ifeq ($(HOST_OS),Darwin)
 # Darwin convention prefixes symbols with underscores.
-NativeExportsFile := $(ObjDir)/$(EXPORTED_SYMBOL_FILE).sed
+NativeExportsFile := $(ObjDir)/$(notdir $(EXPORTED_SYMBOL_FILE)).sed
 $(NativeExportsFile): $(EXPORTED_SYMBOL_FILE) $(ObjDir)/.dir
 	$(Verb) sed -e 's/[[:<:]]/_/' < $< > $@
 clean-local::

Modified: llvm/trunk/runtime/libprofile/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/runtime/libprofile/Makefile?rev=101414&r1=101413&r2=101414&view=diff
==============================================================================
--- llvm/trunk/runtime/libprofile/Makefile (original)
+++ llvm/trunk/runtime/libprofile/Makefile Thu Apr 15 18:08:00 2010
@@ -17,6 +17,6 @@
 LOADABLE_MODULE = 1
 LIBRARYNAME = profile_rt
 EXTRA_DIST = exported_symbols.lst
-EXPORTED_SYMBOL_FILE = exported_symbols.lst
+EXPORTED_SYMBOL_FILE = $(PROJ_SRC_DIR)/exported_symbols.lst
 
 include $(LEVEL)/Makefile.common

Modified: llvm/trunk/tools/edis/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/edis/Makefile?rev=101414&r1=101413&r2=101414&view=diff
==============================================================================
--- llvm/trunk/tools/edis/Makefile (original)
+++ llvm/trunk/tools/edis/Makefile Thu Apr 15 18:08:00 2010
@@ -12,7 +12,7 @@
 
 BUILT_SOURCES = EDInfo.inc
 
-EXPORTED_SYMBOL_FILE = EnhancedDisassembly.exports
+EXPORTED_SYMBOL_FILE = $(PROJ_SRC_DIR)/EnhancedDisassembly.exports
 
 # Include this here so we can get the configuration of the targets
 # that have been configured for construction. We have to do this 

Modified: llvm/trunk/tools/lto/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lto/Makefile?rev=101414&r1=101413&r2=101414&view=diff
==============================================================================
--- llvm/trunk/tools/lto/Makefile (original)
+++ llvm/trunk/tools/lto/Makefile Thu Apr 15 18:08:00 2010
@@ -10,7 +10,7 @@
 LEVEL = ../..
 LIBRARYNAME = LTO
 
-EXPORTED_SYMBOL_FILE = lto.exports
+EXPORTED_SYMBOL_FILE = $(PROJ_SRC_DIR)/lto.exports
 
 # Include this here so we can get the configuration of the targets
 # that have been configured for construction. We have to do this