[llvm-commits] [PATCH] Fix install name inconsistency for loadable modules

[Julien Lerouge]

Hello,

When building a loadable module, the rules in Makefile.rules are set to
generate libraries without the "lib" prefix, but the install target puts
back that prefix.

The attached patch changes that behaviour to install the file without
the "lib" prefix, if the target is a loadable module.

Thanks,
Julien

-- 
Julien Lerouge
PGP Key Id: 0xB1964A62
PGP Fingerprint: 392D 4BAD DB8B CE7F 4E5F FA3C 62DB 4AA7 B196 4A62
PGP Public Key from: keyserver.pgp.com
-------------- next part --------------
Index: Makefile.rules
===================================================================
--- Makefile.rules	(revision 82664)
+++ Makefile.rules	(working copy)
@@ -1004,12 +1004,15 @@
 
 all-local:: $(LibName.SO)
 
-ifdef LINK_LIBS_IN_SHARED
 ifdef LOADABLE_MODULE
-SharedLibKindMessage := "Loadable Module"
+  SharedLibKindMessage := "Loadable Module"
+  DestSharedLib = $(PROJ_libdir)/$(LIBRARYNAME)$(SHLIBEXT)
 else
-SharedLibKindMessage := "Shared Library"
+  SharedLibKindMessage := "Shared Library"
+  DestSharedLib = $(PROJ_libdir)/lib$(LIBRARYNAME)$(SHLIBEXT)
 endif
+
+ifdef LINK_LIBS_IN_SHARED
 $(LibName.SO): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths) $(LibDir)/.dir
 	$(Echo) Linking $(BuildMode) $(SharedLibKindMessage) \
 	  $(LIBRARYNAME)$(SHLIBEXT)
@@ -1032,17 +1035,16 @@
 uninstall-local::
 	$(Echo) Uninstall circumvented with NO_INSTALL
 else
-DestSharedLib = $(PROJ_libdir)/lib$(LIBRARYNAME)$(SHLIBEXT)
-
 install-local:: $(DestSharedLib)
 
 $(DestSharedLib): $(LibName.SO) $(PROJ_libdir)
-	$(Echo) Installing $(BuildMode) Shared Library $(DestSharedLib)
+	$(Echo) Installing $(BuildMode) $(SharedLibKindMessage) $(DestSharedLib)
 	$(Verb) $(INSTALL) $(LibName.SO) $(DestSharedLib)
 
 uninstall-local::
-	$(Echo) Uninstalling $(BuildMode) Shared Library $(DestSharedLib)
-	-$(Verb) $(RM) -f $(PROJ_libdir)/lib$(LIBRARYNAME).*
+	$(Echo) Uninstalling $(BuildMode) $(SharedLibKindMessage) \
+          $(DestSharedLib)
+	-$(Verb) $(RM) -f $(DestSharedLib)
 endif
 endif