Skip to content

Commit 37da22b

Browse files
gvanrossumgvanrossum
committed
The C+ compiler is called $(CXX) these days, not CCC.
This fixes SF Bug python#124478.
1 parent 23f26ce commit 37da22b

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

‎Misc/Makefile.pre.in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ SO= @SO@
128128
LDSHARED= @LDSHARED@
129129
CCSHARED= @CCSHARED@
130130
LINKFORSHARED= @LINKFORSHARED@
131-
#@SET_CCC@
131+
#@SET_CXX@
132132

133133
# Install prefix for architecture-independent files
134134
prefix= /usr/local
@@ -251,7 +251,7 @@ sedscript: $(MAKEFILE)
251251
-e '2s%.*%# $H%p' \
252252
-e '/^VERSION=/s/^VERSION=[ ]*\(.*\)/s%@VERSION[@]%\1%/p' \
253253
-e '/^CC=/s/^CC=[ ]*\(.*\)/s%@CC[@]%\1%/p' \
254-
-e '/^CCC=/s/^CCC=[ ]*\(.*\)/s%#@SET_CCC[@]%CCC=\1%/p' \
254+
-e '/^CXX=/s/^CXX=[ ]*\(.*\)/s%#@SET_CXX[@]%CXX=\1%/p' \
255255
-e '/^LINKCC=/s/^LINKCC=[ ]*\(.*\)/s%@LINKCC[@]%\1%/p' \
256256
-e '/^OPT=/s/^OPT=[ ]*\(.*\)/s%@OPT[@]%\1%/p' \
257257
-e '/^LDFLAGS=/s/^LDFLAGS=[ ]*\(.*\)/s%@LDFLAGS[@]%\1%/p' \
@@ -270,7 +270,7 @@ sedscript: $(MAKEFILE)
270270
-e '/^$P=/s/^$P=\(.*\)/s%^$P=.*%$P=\1%/p' \
271271
-e '/^$E=/s/^$E=\(.*\)/s%^$E=.*%$E=\1%/p' \
272272
$(MAKEFILE) >sedscript
273-
echo "/^#@SET_CCC@/d" >>sedscript
273+
echo "/^#@SET_CXX@/d" >>sedscript
274274
echo "/^installdir=/s%=.*%= $(installdir)%" >>sedscript
275275
echo "/^exec_installdir=/s%=.*%=$(exec_installdir)%" >>sedscript
276276
echo "/^srcdir=/s%=.*%= $(srcdir)%" >>sedscript

‎Modules/makesetup‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -179,11 +179,11 @@ sed -e 's/[ ]*#.*//' -e '/^[ ]*$/d' |
179179
do
180180
case $src in
181181
*.c) obj=`basename $src .c`.o; cc='$(CC)';;
182-
*.cc) obj=`basename $src .cc`.o; cc='$(CCC)';;
183-
*.c++) obj=`basename $src .c++`.o; cc='$(CCC)';;
184-
*.C) obj=`basename $src .C`.o; cc='$(CCC)';;
185-
*.cxx) obj=`basename $src .cxx`.o; cc='$(CCC)';;
186-
*.cpp) obj=`basename $src .cpp`.o; cc='$(CCC)';;
182+
*.cc) obj=`basename $src .cc`.o; cc='$(CXX)';;
183+
*.c++) obj=`basename $src .c++`.o; cc='$(CXX)';;
184+
*.C) obj=`basename $src .C`.o; cc='$(CXX)';;
185+
*.cxx) obj=`basename $src .cxx`.o; cc='$(CXX)';;
186+
*.cpp) obj=`basename $src .cpp`.o; cc='$(CXX)';;
187187
*) continue;;
188188
esac
189189
objs="$objs $obj"

0 commit comments

Comments
 (0)