[llvm-commits] CVS: llvm/Makefile.common

[John Criswell]

Changes in directory llvm:

Makefile.common updated: 1.96.2.3 -> 1.96.2.4

---
Log message:

Updated the dynamic library linking fix so that it is based off of libtool
generated object files.  This will hopefully avoid any dependency problems
that could arise by using both the .o and .lo files suffixes.



---
Diffs of the changes:

Index: llvm/Makefile.common
diff -u llvm/Makefile.common:1.96.2.3 llvm/Makefile.common:1.96.2.4
--- llvm/Makefile.common:1.96.2.3	Thu Jul 10 17:56:09 2003
+++ llvm/Makefile.common	Mon Jul 14 09:10:29 2003
@@ -491,26 +491,29 @@
 # Rules for building libraries
 #--------------------------------------------------------------------
 
+#
+# Determine which flag to use.
+#
 ifeq ($(OS),SunOS)
-Share=-G
+SharedOpt=-G
 else
-Share=-shared
+SharedOpt=-shared
 endif
 
 #
 # Rules for building dynamically linked libraries.
 #
-$(LIBNAME_O): $(RealObjectsO) $(LibSubDirs) $(DESTLIBRELEASE)/.dir
+$(LIBNAME_O): $(ObjectsO) $(LibSubDirs) $(DESTLIBRELEASE)/.dir
 	@echo ======= Linking $(LIBRARYNAME) dynamic release library =======
-	$(VERB) $(CXX) $(Share) -o $@ $(RealObjectsO) $(LibSubDirs) $(LibLinkOpts);
+	$(VERB) $(LIBTOOL) --mode=link $(CXX) $(SharedOpt) -o $@ $(ObjectsO) $(LibSubDirs) $(LibLinkOpts);
 
 $(LIBNAME_P): $(ObjectsP) $(LibSubDirs) $(DESTLIBPROFILE)/.dir
 	@echo ======= Linking $(LIBRARYNAME) dynamic profile library =======
-	$(VERB) $(CXX) $(Share) -o $@ $(RealObjectsP) $(LibSubDirs) $(LibLinkOpts);
+	$(VERB) $(LIBTOOL) --mode=link $(CXX) $(SharedOpt) -o $@ $(ObjectsP) $(LibSubDirs) $(LibLinkOpts);
 
 $(LIBNAME_G): $(ObjectsG) $(LibSubDirs) $(DESTLIBDEBUG)/.dir
 	@echo ======= Linking $(LIBRARYNAME) dynamic debug library =======
-	$(VERB) $(CXX) $(Share) -o $@ $(RealObjectsG) $(LibSubDirs) $(LibLinkOpts);
+	$(VERB) $(LIBTOOL) --mode=link $(CXX) $(SharedOpt) -o $@ $(ObjectsG) $(LibSubDirs) $(LibLinkOpts);
 
 #
 # Rules for building static archive libraries.