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

[Brian Gaeke]

Changes in directory llvm:

Makefile.rules updated: 1.185 -> 1.186

---
Log message:

Explicitly specify libtool tag "CXX" so that if you setenv CXX to something
libtool can't parse, e.g., "/path/to/g++ -some-funny-options", 
then it will still be able to compile and link.


---
Diffs of the changes:  (+3 -3)

Index: llvm/Makefile.rules
diff -u llvm/Makefile.rules:1.185 llvm/Makefile.rules:1.186
--- llvm/Makefile.rules:1.185	Tue Jun  1 14:05:53 2004
+++ llvm/Makefile.rules	Tue Jun  8 13:52:45 2004
@@ -302,7 +302,7 @@
 #
 # Compile commands with libtool.
 #
-Compile  := $(LIBTOOL) --mode=compile $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(CompileCommonOpts)
+Compile  := $(LIBTOOL) --tag=CXX --mode=compile $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(CompileCommonOpts)
 CompileC  := $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(CompileCommonOpts)
 
 # Compile a cpp file, don't link...
@@ -323,7 +323,7 @@
 # Link final executable
 #	(Note that we always link with the C++ compiler).
 #
-Link     := $(LIBTOOL) --mode=link $(CXX)
+Link     := $(LIBTOOL) --tag=CXX --mode=link $(CXX)
 
 # link both projlib and llvmlib libraries
 LinkG    := $(Link) -g -L$(PROJLIBDEBUGSOURCE)  -L$(LLVMLIBDEBUGSOURCE) $(STRIP)
@@ -341,7 +341,7 @@
 endif
 
 # Create one .o file from a bunch of .o files...
-Relink := ${LIBTOOL} --mode=link $(CXX)
+Relink := ${LIBTOOL} --tag=CXX --mode=link $(CXX)
 
 #
 # Configure where the item being compiled should go.