The C+ compiler is called $(CXX) these days, not CCC.

This fixes SF Bug #124478.

diff --git a/Misc/Makefile.pre.in b/Misc/Makefile.pre.in
index 1cc91a17643ec3d899ad8fe9cbcd8f6093b302a4..f15a68f5e56464a566668a3a862363364b12d523 100644 (file)
--- a/Misc/Makefile.pre.in
+++ b/Misc/Makefile.pre.in
@@ -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

diff --git a/Modules/makesetup b/Modules/makesetup
index 09ab50cf46cc440f92ed3f2df38afcf684ef5215..528f118dd81237c69e5b40908955900349df9b8d 100755 (executable)
--- a/Modules/makesetup
+++ b/Modules/makesetup
@@ -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"