diff options
| author | Brian Gaeke <gaeke@uiuc.edu> | 2004-06-08 18:52:45 +0000 |
|---|---|---|
| committer | Brian Gaeke <gaeke@uiuc.edu> | 2004-06-08 18:52:45 +0000 |
| commit | 223b345279b45c4ef02d412af9599df8275b986f (patch) | |
| tree | 012db7bfec4b9503200e6cf1af14a49495267657 | |
| parent | a20f4aab7f4117d501b316e0053b1dbb5981bb72 (diff) | |
| download | llvm-223b345279b45c4ef02d412af9599df8275b986f.zip llvm-223b345279b45c4ef02d412af9599df8275b986f.tar.gz llvm-223b345279b45c4ef02d412af9599df8275b986f.tar.bz2 | |
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.
llvm-svn: 14072
| -rw-r--r-- | llvm/Makefile.rules | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/llvm/Makefile.rules b/llvm/Makefile.rules index 25a866d..37d9504 100644 --- a/llvm/Makefile.rules +++ b/llvm/Makefile.rules @@ -302,7 +302,7 @@ CompileOptimizeOpts := -O3 -DNDEBUG -finline-functions # # 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 @@ CompileCP := $(CompileC) $(CompileOptimizeOpts) $(PROFILE) # 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 @@ LinkP := $(LinkP) $(TOOLLINKOPTSB) 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. |