Make the export files absolute paths, and change Makefile.rules

to expect them this way, to fix srcdir!=objdir builds.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@101414 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Makefile.rules b/Makefile.rules
index 0c5d9066a361a9d87f03f4e13945b34c1addf144..9ff6c79b6e5d443ad6f8ac9b894e3f825302af0d 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -978,7 +978,7 @@ ifdef EXPORTED_SYMBOL_FILE
 
 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::

diff --git a/runtime/libprofile/Makefile b/runtime/libprofile/Makefile
index b3076c419f6f82d14deb6de42891f49be3e1e27d..15e677951299258b8f34c52a062d560f21a381c6 100644 (file)
--- a/runtime/libprofile/Makefile
+++ b/runtime/libprofile/Makefile
@@ -17,6 +17,6 @@ SHARED_LIBRARY = 1
 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

diff --git a/tools/edis/Makefile b/tools/edis/Makefile
index 4f9d03aad65c3d713dc46f03efa4534e9a92f140..9151f627bb0ccb7766649489138569f3f7a7792c 100644 (file)
--- a/tools/edis/Makefile
+++ b/tools/edis/Makefile
@@ -12,7 +12,7 @@ LIBRARYNAME = EnhancedDisassembly
 
 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 

diff --git a/tools/lto/Makefile b/tools/lto/Makefile
index fe01ac1886334b1631cc0b78a9fd2ca897864d25..8d57333f9c0c3bf620ef6e178ef6c1416cccaace 100644 (file)
--- a/tools/lto/Makefile
+++ b/tools/lto/Makefile
@@ -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