Skip to content

Commit

Permalink
Explicitly specify libtool tag "CXX" so that if you setenv CXX to som…
Browse files Browse the repository at this point in the history
…ething

libtool can't parse, e.g., "/path/to/g++ -some-funny-options",
then it will still be able to compile and link.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@14072 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
Brian Gaeke committed Jun 8, 2004
1 parent 82d5590 commit 10c508b
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Makefile.rules
Original file line number Diff line number Diff line change
Expand Up @@ -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...
Expand All @@ -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)
Expand All @@ -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.
Expand Down

0 comments on commit 10c508b

Please sign in to comment.