diff options
| author | Dan Gohman <gohman@apple.com> | 2010-04-15 23:08:00 +0000 |
|---|---|---|
| committer | Dan Gohman <gohman@apple.com> | 2010-04-15 23:08:00 +0000 |
| commit | 7c52f2ee06c8b22287d658fc30d00525f8d4db42 (patch) | |
| tree | 191a0614a61923244f2833e5f4885209f222baa6 | |
| parent | 2d675f130804cdc92137101c0f88d4c91bfa0950 (diff) | |
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
| -rw-r--r-- | Makefile.rules | 2 | ||||
| -rw-r--r-- | runtime/libprofile/Makefile | 2 | ||||
| -rw-r--r-- | tools/edis/Makefile | 2 | ||||
| -rw-r--r-- | tools/lto/Makefile | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.rules b/Makefile.rules index 0c5d9066a3..9ff6c79b6e 100644 --- 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 b3076c419f..15e6779512 100644 --- 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 4f9d03aad6..9151f627bb 100644 --- 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 fe01ac1886..8d57333f9c 100644 --- 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 |