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

diff --git a/Makefile.rules b/Makefile.rules
index 2fc5eeb0c7c33ad94566abd655b3697300884e37..408588132f607c76ca09c75e83fd9a0b28bfa952 100644 (file)
--- 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 77eacb7ee5bfa5735a29ff60fb8ecb1882405c78..1627346810709dfd431a14ef48486d2fb0e159d7 100644 (file)
--- 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