[llvm-commits] [llvm] r103897 - in /llvm/trunk: Makefile.rules tools/gold/Makefile

[Rafael Espindola]

Author: rafael
Date: Sat May 15 22:13:23 2010
New Revision: 103897

URL: http://llvm.org/viewvc/llvm-project?rev=103897&view=rev
Log:
Avoid renaming loadable modules at install time. Now the gold plugin is named
LLVMgold.so both in both the build and install directories.

Modified:
    llvm/trunk/Makefile.rules
    llvm/trunk/tools/gold/Makefile

Modified: llvm/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile.rules?rev=103897&r1=103896&r2=103897&view=diff
==============================================================================
--- llvm/trunk/Makefile.rules (original)
+++ llvm/trunk/Makefile.rules Sat May 15 22:13:23 2010
@@ -1128,7 +1128,12 @@
 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)
 

Modified: llvm/trunk/tools/gold/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/gold/Makefile?rev=103897&r1=103896&r2=103897&view=diff
==============================================================================
--- llvm/trunk/tools/gold/Makefile (original)
+++ llvm/trunk/tools/gold/Makefile Sat May 15 22:13:23 2010
@@ -8,7 +8,7 @@
 ##===----------------------------------------------------------------------===##
 
 LEVEL = ../..
-LIBRARYNAME = libLLVMgold
+LIBRARYNAME = LLVMgold
 
 EXPORTED_SYMBOL_FILE = $(PROJ_SRC_DIR)/gold.exports