summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2010-05-16 03:13:23 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2010-05-16 03:13:23 +0000
commitbbe03f8d296a0b92344d6ff0d898380b7bef78d5 (patch)
tree1c8c4f06786f1cdf61ed826c41348dec7797fedb
parenta89efd537d0b518b089e0a1dd6cecd9b7693c649 (diff)
downloadllvm-bbe03f8d296a0b92344d6ff0d898380b7bef78d5.tar.gz
llvm-bbe03f8d296a0b92344d6ff0d898380b7bef78d5.tar.bz2
llvm-bbe03f8d296a0b92344d6ff0d898380b7bef78d5.tar.xz
Avoid renaming loadable modules at install time. Now the gold plugin is named
LLVMgold.so both in both the build and install directories. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@103897 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--Makefile.rules5
-rw-r--r--tools/gold/Makefile2
2 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.rules b/Makefile.rules
index 2fc5eeb0c7..408588132f 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -1128,7 +1128,12 @@ install-local::
uninstall-local::
$(Echo) Uninstall circumvented with NO_INSTALL
else
+
+ifdef LOADABLE_MODULE
+DestSharedLib = $(DESTDIR)$(PROJ_libdir)/$(LIBRARYNAME)$(SHLIBEXT)
+else
DestSharedLib = $(DESTDIR)$(PROJ_libdir)/lib$(LIBRARYNAME)$(SHLIBEXT)
+endif
install-local:: $(DestSharedLib)
diff --git a/tools/gold/Makefile b/tools/gold/Makefile
index 77eacb7ee5..1627346810 100644
--- a/tools/gold/Makefile
+++ b/tools/gold/Makefile
@@ -8,7 +8,7 @@
##===----------------------------------------------------------------------===##
LEVEL = ../..
-LIBRARYNAME = libLLVMgold
+LIBRARYNAME = LLVMgold
EXPORTED_SYMBOL_FILE = $(PROJ_SRC_DIR)/gold.exports