The C+ compiler is called $(CXX) these days, not CCC.
This fixes SF Bug #124478.
This commit is contained in:
parent
23f26ce813
commit
37da22b3f4
|
@ -128,7 +128,7 @@ SO= @SO@
|
|||
LDSHARED= @LDSHARED@
|
||||
CCSHARED= @CCSHARED@
|
||||
LINKFORSHARED= @LINKFORSHARED@
|
||||
#@SET_CCC@
|
||||
#@SET_CXX@
|
||||
|
||||
# Install prefix for architecture-independent files
|
||||
prefix= /usr/local
|
||||
|
@ -251,7 +251,7 @@ sedscript: $(MAKEFILE)
|
|||
-e '2s%.*%# $H%p' \
|
||||
-e '/^VERSION=/s/^VERSION=[ ]*\(.*\)/s%@VERSION[@]%\1%/p' \
|
||||
-e '/^CC=/s/^CC=[ ]*\(.*\)/s%@CC[@]%\1%/p' \
|
||||
-e '/^CCC=/s/^CCC=[ ]*\(.*\)/s%#@SET_CCC[@]%CCC=\1%/p' \
|
||||
-e '/^CXX=/s/^CXX=[ ]*\(.*\)/s%#@SET_CXX[@]%CXX=\1%/p' \
|
||||
-e '/^LINKCC=/s/^LINKCC=[ ]*\(.*\)/s%@LINKCC[@]%\1%/p' \
|
||||
-e '/^OPT=/s/^OPT=[ ]*\(.*\)/s%@OPT[@]%\1%/p' \
|
||||
-e '/^LDFLAGS=/s/^LDFLAGS=[ ]*\(.*\)/s%@LDFLAGS[@]%\1%/p' \
|
||||
|
@ -270,7 +270,7 @@ sedscript: $(MAKEFILE)
|
|||
-e '/^$P=/s/^$P=\(.*\)/s%^$P=.*%$P=\1%/p' \
|
||||
-e '/^$E=/s/^$E=\(.*\)/s%^$E=.*%$E=\1%/p' \
|
||||
$(MAKEFILE) >sedscript
|
||||
echo "/^#@SET_CCC@/d" >>sedscript
|
||||
echo "/^#@SET_CXX@/d" >>sedscript
|
||||
echo "/^installdir=/s%=.*%= $(installdir)%" >>sedscript
|
||||
echo "/^exec_installdir=/s%=.*%=$(exec_installdir)%" >>sedscript
|
||||
echo "/^srcdir=/s%=.*%= $(srcdir)%" >>sedscript
|
||||
|
|
|
@ -179,11 +179,11 @@ sed -e 's/[ ]*#.*//' -e '/^[ ]*$/d' |
|
|||
do
|
||||
case $src in
|
||||
*.c) obj=`basename $src .c`.o; cc='$(CC)';;
|
||||
*.cc) obj=`basename $src .cc`.o; cc='$(CCC)';;
|
||||
*.c++) obj=`basename $src .c++`.o; cc='$(CCC)';;
|
||||
*.C) obj=`basename $src .C`.o; cc='$(CCC)';;
|
||||
*.cxx) obj=`basename $src .cxx`.o; cc='$(CCC)';;
|
||||
*.cpp) obj=`basename $src .cpp`.o; cc='$(CCC)';;
|
||||
*.cc) obj=`basename $src .cc`.o; cc='$(CXX)';;
|
||||
*.c++) obj=`basename $src .c++`.o; cc='$(CXX)';;
|
||||
*.C) obj=`basename $src .C`.o; cc='$(CXX)';;
|
||||
*.cxx) obj=`basename $src .cxx`.o; cc='$(CXX)';;
|
||||
*.cpp) obj=`basename $src .cpp`.o; cc='$(CXX)';;
|
||||
*) continue;;
|
||||
esac
|
||||
objs="$objs $obj"
|
||||
|
|
Loading…
Reference in New Issue