Skip to content

Commit 6257b0e

Browse files
Fidget-SpinnerFidget-Spinner
committed
Revert "Pass jobserver env to all commands"
This reverts commit c7f4cc4.
1 parent 9e013cf commit 6257b0e

File tree

4 files changed

+176
-131
lines changed

4 files changed

+176
-131
lines changed

‎Makefile.pre.in‎

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -995,23 +995,23 @@ build-details.json: pybuilddir.txt
995995
# Build static library
996996
$(LIBRARY): $(LIBRARY_OBJS)
997997
-rm -f $@
998-
+$(AR) $(ARFLAGS) $@ $(LIBRARY_OBJS)
998+
$(AR) $(ARFLAGS) $@ $(LIBRARY_OBJS)
999999

10001000
libpython$(LDVERSION).so: $(LIBRARY_OBJS) $(DTRACE_OBJS)
1001-
+$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM)
1001+
$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM)
10021002
if test $(INSTSONAME) != $@; then \
10031003
$(LN) -f $(INSTSONAME) $@; \
10041004
fi
10051005

10061006
libpython3.so: libpython$(LDVERSION).so
1007-
+$(BLDSHARED) $(NO_AS_NEEDED) -o $@ -Wl,-h$@ $^
1007+
$(BLDSHARED) $(NO_AS_NEEDED) -o $@ -Wl,-h$@ $^
10081008

10091009
libpython$(LDVERSION).dylib: $(LIBRARY_OBJS)
1010-
+$(CC) -dynamiclib $(PY_CORE_LDFLAGS) -undefined dynamic_lookup -Wl,-install_name,$(prefix)/lib/libpython$(LDVERSION).dylib -Wl,-compatibility_version,$(VERSION) -Wl,-current_version,$(VERSION) -o $@ $(LIBRARY_OBJS) $(DTRACE_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \
1010+
$(CC) -dynamiclib $(PY_CORE_LDFLAGS) -undefined dynamic_lookup -Wl,-install_name,$(prefix)/lib/libpython$(LDVERSION).dylib -Wl,-compatibility_version,$(VERSION) -Wl,-current_version,$(VERSION) -o $@ $(LIBRARY_OBJS) $(DTRACE_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \
10111011

10121012

10131013
libpython$(VERSION).sl: $(LIBRARY_OBJS)
1014-
+$(LDSHARED) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM)
1014+
$(LDSHARED) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM)
10151015

10161016
# List of exported symbols for AIX
10171017
Modules/python.exp: $(LIBRARY)
@@ -1036,7 +1036,7 @@ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \
10361036
$(LIBRARY) \
10371037
$(RESSRCDIR)/Info.plist
10381038
$(INSTALL) -d -m $(DIRMODE) $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)
1039-
+$(CC) -o $(LDLIBRARY) $(PY_CORE_LDFLAGS) -dynamiclib \
1039+
$(CC) -o $(LDLIBRARY) $(PY_CORE_LDFLAGS) -dynamiclib \
10401040
-all_load $(LIBRARY) \
10411041
-install_name $(DESTDIR)$(PYTHONFRAMEWORKINSTALLNAMEPREFIX)/$(PYTHONFRAMEWORK) \
10421042
-compatibility_version $(VERSION) \
@@ -1057,7 +1057,7 @@ $(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK): \
10571057
$(LIBRARY) \
10581058
$(RESSRCDIR)/Info.plist
10591059
$(INSTALL) -d -m $(DIRMODE) $(PYTHONFRAMEWORKDIR)
1060-
+$(CC) -o $(LDLIBRARY) $(PY_CORE_LDFLAGS) -dynamiclib \
1060+
$(CC) -o $(LDLIBRARY) $(PY_CORE_LDFLAGS) -dynamiclib \
10611061
-all_load $(LIBRARY) \
10621062
-install_name $(PYTHONFRAMEWORKINSTALLNAMEPREFIX)/$(PYTHONFRAMEWORK) \
10631063
-compatibility_version $(VERSION) \
@@ -1394,70 +1394,70 @@ LIBMPDEC_CFLAGS=@LIBMPDEC_CFLAGS@ $(PY_STDMODULE_CFLAGS) $(CCSHARED)
13941394

13951395
# "%.o: %c" is not portable
13961396
Modules/_decimal/libmpdec/basearith.o: $(srcdir)/Modules/_decimal/libmpdec/basearith.c $(LIBMPDEC_HEADERS) $(PYTHON_HEADERS)
1397-
+$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/basearith.c
1397+
$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/basearith.c
13981398

13991399
Modules/_decimal/libmpdec/constants.o: $(srcdir)/Modules/_decimal/libmpdec/constants.c $(LIBMPDEC_HEADERS) $(PYTHON_HEADERS)
1400-
+$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/constants.c
1400+
$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/constants.c
14011401

14021402
Modules/_decimal/libmpdec/context.o: $(srcdir)/Modules/_decimal/libmpdec/context.c $(LIBMPDEC_HEADERS) $(PYTHON_HEADERS)
1403-
+$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/context.c
1403+
$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/context.c
14041404

14051405
Modules/_decimal/libmpdec/convolute.o: $(srcdir)/Modules/_decimal/libmpdec/convolute.c $(LIBMPDEC_HEADERS) $(PYTHON_HEADERS)
1406-
+$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/convolute.c
1406+
$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/convolute.c
14071407

14081408
Modules/_decimal/libmpdec/crt.o: $(srcdir)/Modules/_decimal/libmpdec/crt.c $(LIBMPDEC_HEADERS) $(PYTHON_HEADERS)
1409-
+$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/crt.c
1409+
$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/crt.c
14101410

14111411
Modules/_decimal/libmpdec/difradix2.o: $(srcdir)/Modules/_decimal/libmpdec/difradix2.c $(LIBMPDEC_HEADERS) $(PYTHON_HEADERS)
1412-
+$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/difradix2.c
1412+
$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/difradix2.c
14131413

14141414
Modules/_decimal/libmpdec/fnt.o: $(srcdir)/Modules/_decimal/libmpdec/fnt.c $(LIBMPDEC_HEADERS) $(PYTHON_HEADERS)
1415-
+$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/fnt.c
1415+
$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/fnt.c
14161416

14171417
Modules/_decimal/libmpdec/fourstep.o: $(srcdir)/Modules/_decimal/libmpdec/fourstep.c $(LIBMPDEC_HEADERS) $(PYTHON_HEADERS)
1418-
+$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/fourstep.c
1418+
$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/fourstep.c
14191419

14201420
Modules/_decimal/libmpdec/io.o: $(srcdir)/Modules/_decimal/libmpdec/io.c $(LIBMPDEC_HEADERS) $(PYTHON_HEADERS)
1421-
+$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/io.c
1421+
$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/io.c
14221422

14231423
Modules/_decimal/libmpdec/mpalloc.o: $(srcdir)/Modules/_decimal/libmpdec/mpalloc.c $(LIBMPDEC_HEADERS) $(PYTHON_HEADERS)
1424-
+$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/mpalloc.c
1424+
$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/mpalloc.c
14251425

14261426
Modules/_decimal/libmpdec/mpdecimal.o: $(srcdir)/Modules/_decimal/libmpdec/mpdecimal.c $(LIBMPDEC_HEADERS) $(PYTHON_HEADERS)
1427-
+$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/mpdecimal.c
1427+
$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/mpdecimal.c
14281428

14291429
Modules/_decimal/libmpdec/mpsignal.o: $(srcdir)/Modules/_decimal/libmpdec/mpsignal.c $(LIBMPDEC_HEADERS) $(PYTHON_HEADERS)
1430-
+$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/mpsignal.c
1430+
$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/mpsignal.c
14311431

14321432
Modules/_decimal/libmpdec/numbertheory.o: $(srcdir)/Modules/_decimal/libmpdec/numbertheory.c $(LIBMPDEC_HEADERS) $(PYTHON_HEADERS)
1433-
+$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/numbertheory.c
1433+
$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/numbertheory.c
14341434

14351435
Modules/_decimal/libmpdec/sixstep.o: $(srcdir)/Modules/_decimal/libmpdec/sixstep.c $(LIBMPDEC_HEADERS) $(PYTHON_HEADERS)
1436-
+$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/sixstep.c
1436+
$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/sixstep.c
14371437

14381438
Modules/_decimal/libmpdec/transpose.o: $(srcdir)/Modules/_decimal/libmpdec/transpose.c $(LIBMPDEC_HEADERS) $(PYTHON_HEADERS)
1439-
+$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/transpose.c
1439+
$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/transpose.c
14401440

14411441
$(LIBMPDEC_A): $(LIBMPDEC_OBJS)
14421442
-rm -f $@
1443-
+$(AR) $(ARFLAGS) $@ $(LIBMPDEC_OBJS)
1443+
$(AR) $(ARFLAGS) $@ $(LIBMPDEC_OBJS)
14441444

14451445
##########################################################################
14461446
# Build static libexpat.a
14471447
LIBEXPAT_CFLAGS=@LIBEXPAT_CFLAGS@ $(PY_STDMODULE_CFLAGS) $(CCSHARED)
14481448

14491449
Modules/expat/xmlparse.o: $(srcdir)/Modules/expat/xmlparse.c $(LIBEXPAT_HEADERS) $(PYTHON_HEADERS)
1450-
+$(CC) -c $(LIBEXPAT_CFLAGS) -o $@ $(srcdir)/Modules/expat/xmlparse.c
1450+
$(CC) -c $(LIBEXPAT_CFLAGS) -o $@ $(srcdir)/Modules/expat/xmlparse.c
14511451

14521452
Modules/expat/xmlrole.o: $(srcdir)/Modules/expat/xmlrole.c $(LIBEXPAT_HEADERS) $(PYTHON_HEADERS)
1453-
+$(CC) -c $(LIBEXPAT_CFLAGS) -o $@ $(srcdir)/Modules/expat/xmlrole.c
1453+
$(CC) -c $(LIBEXPAT_CFLAGS) -o $@ $(srcdir)/Modules/expat/xmlrole.c
14541454

14551455
Modules/expat/xmltok.o: $(srcdir)/Modules/expat/xmltok.c $(LIBEXPAT_HEADERS) $(PYTHON_HEADERS)
1456-
+$(CC) -c $(LIBEXPAT_CFLAGS) -o $@ $(srcdir)/Modules/expat/xmltok.c
1456+
$(CC) -c $(LIBEXPAT_CFLAGS) -o $@ $(srcdir)/Modules/expat/xmltok.c
14571457

14581458
$(LIBEXPAT_A): $(LIBEXPAT_OBJS)
14591459
-rm -f $@
1460-
+$(AR) $(ARFLAGS) $@ $(LIBEXPAT_OBJS)
1460+
$(AR) $(ARFLAGS) $@ $(LIBEXPAT_OBJS)
14611461

14621462
##########################################################################
14631463
# Build HACL* static libraries for hashlib and HACL* HMAC.
@@ -1466,67 +1466,67 @@ $(LIBEXPAT_A): $(LIBEXPAT_OBJS)
14661466
# have the ability to compile vectorized versions
14671467

14681468
Modules/_hacl/Hacl_Hash_MD5.o: $(srcdir)/Modules/_hacl/Hacl_Hash_MD5.c $(LIBHACL_MD5_HEADERS)
1469-
+$(CC) -c $(LIBHACL_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_MD5.c
1469+
$(CC) -c $(LIBHACL_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_MD5.c
14701470

14711471
$(LIBHACL_MD5_A): $(LIBHACL_MD5_OBJS)
14721472
-rm -f $@
1473-
+$(AR) $(ARFLAGS) $@ $(LIBHACL_MD5_OBJS)
1473+
$(AR) $(ARFLAGS) $@ $(LIBHACL_MD5_OBJS)
14741474

14751475
Modules/_hacl/Hacl_Hash_SHA1.o: $(srcdir)/Modules/_hacl/Hacl_Hash_SHA1.c $(LIBHACL_SHA1_HEADERS)
1476-
+$(CC) -c $(LIBHACL_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_SHA1.c
1476+
$(CC) -c $(LIBHACL_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_SHA1.c
14771477

14781478
$(LIBHACL_SHA1_A): $(LIBHACL_SHA1_OBJS)
14791479
-rm -f $@
1480-
+$(AR) $(ARFLAGS) $@ $(LIBHACL_SHA1_OBJS)
1480+
$(AR) $(ARFLAGS) $@ $(LIBHACL_SHA1_OBJS)
14811481

14821482
Modules/_hacl/Hacl_Hash_SHA2.o: $(srcdir)/Modules/_hacl/Hacl_Hash_SHA2.c $(LIBHACL_SHA2_HEADERS)
1483-
+$(CC) -c $(LIBHACL_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_SHA2.c
1483+
$(CC) -c $(LIBHACL_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_SHA2.c
14841484

14851485
$(LIBHACL_SHA2_A): $(LIBHACL_SHA2_OBJS)
14861486
-rm -f $@
1487-
+$(AR) $(ARFLAGS) $@ $(LIBHACL_SHA2_OBJS)
1487+
$(AR) $(ARFLAGS) $@ $(LIBHACL_SHA2_OBJS)
14881488

14891489
Modules/_hacl/Hacl_Hash_SHA3.o: $(srcdir)/Modules/_hacl/Hacl_Hash_SHA3.c $(LIBHACL_SHA3_HEADERS)
1490-
+$(CC) -c $(LIBHACL_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_SHA3.c
1490+
$(CC) -c $(LIBHACL_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_SHA3.c
14911491

14921492
$(LIBHACL_SHA3_A): $(LIBHACL_SHA3_OBJS)
14931493
-rm -f $@
1494-
+$(AR) $(ARFLAGS) $@ $(LIBHACL_SHA3_OBJS)
1494+
$(AR) $(ARFLAGS) $@ $(LIBHACL_SHA3_OBJS)
14951495

14961496
Modules/_hacl/Hacl_Hash_Blake2s.o: $(srcdir)/Modules/_hacl/Hacl_Hash_Blake2s.c $(LIBHACL_BLAKE2_HEADERS)
1497-
+$(CC) -c $(LIBHACL_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_Blake2s.c
1497+
$(CC) -c $(LIBHACL_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_Blake2s.c
14981498

14991499
Modules/_hacl/Hacl_Hash_Blake2b.o: $(srcdir)/Modules/_hacl/Hacl_Hash_Blake2b.c $(LIBHACL_BLAKE2_HEADERS)
1500-
+$(CC) -c $(LIBHACL_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_Blake2b.c
1500+
$(CC) -c $(LIBHACL_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_Blake2b.c
15011501

15021502
Modules/_hacl/Hacl_Hash_Blake2s_Simd128.o: $(srcdir)/Modules/_hacl/Hacl_Hash_Blake2s_Simd128.c $(LIBHACL_BLAKE2_HEADERS)
1503-
+$(CC) -c $(LIBHACL_CFLAGS) $(LIBHACL_SIMD128_FLAGS) -DHACL_CAN_COMPILE_VEC128 -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_Blake2s_Simd128.c
1503+
$(CC) -c $(LIBHACL_CFLAGS) $(LIBHACL_SIMD128_FLAGS) -DHACL_CAN_COMPILE_VEC128 -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_Blake2s_Simd128.c
15041504

15051505
Modules/_hacl/Hacl_Hash_Blake2s_Simd128_universal2.o: $(srcdir)/Modules/_hacl/Hacl_Hash_Blake2s_Simd128_universal2.c $(LIBHACL_BLAKE2_HEADERS)
1506-
+$(CC) -c $(LIBHACL_CFLAGS) $(LIBHACL_SIMD128_FLAGS) -DHACL_CAN_COMPILE_VEC128 -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_Blake2s_Simd128_universal2.c
1506+
$(CC) -c $(LIBHACL_CFLAGS) $(LIBHACL_SIMD128_FLAGS) -DHACL_CAN_COMPILE_VEC128 -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_Blake2s_Simd128_universal2.c
15071507

15081508
Modules/_hacl/Hacl_Hash_Blake2b_Simd256.o: $(srcdir)/Modules/_hacl/Hacl_Hash_Blake2b_Simd256.c $(LIBHACL_BLAKE2_HEADERS)
1509-
+$(CC) -c $(LIBHACL_CFLAGS) $(LIBHACL_SIMD256_FLAGS) -DHACL_CAN_COMPILE_VEC256 -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_Blake2b_Simd256.c
1509+
$(CC) -c $(LIBHACL_CFLAGS) $(LIBHACL_SIMD256_FLAGS) -DHACL_CAN_COMPILE_VEC256 -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_Blake2b_Simd256.c
15101510

15111511
Modules/_hacl/Hacl_Hash_Blake2b_Simd256_universal2.o: $(srcdir)/Modules/_hacl/Hacl_Hash_Blake2b_Simd256_universal2.c $(LIBHACL_BLAKE2_HEADERS)
1512-
+$(CC) -c $(LIBHACL_CFLAGS) $(LIBHACL_SIMD256_FLAGS) -DHACL_CAN_COMPILE_VEC256 -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_Blake2b_Simd256_universal2.c
1512+
$(CC) -c $(LIBHACL_CFLAGS) $(LIBHACL_SIMD256_FLAGS) -DHACL_CAN_COMPILE_VEC256 -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_Blake2b_Simd256_universal2.c
15131513

15141514
Modules/_hacl/Lib_Memzero0.o: $(srcdir)/Modules/_hacl/Lib_Memzero0.c $(LIBHACL_BLAKE2_HEADERS)
1515-
+$(CC) -c $(LIBHACL_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Lib_Memzero0.c
1515+
$(CC) -c $(LIBHACL_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Lib_Memzero0.c
15161516

15171517
$(LIBHACL_BLAKE2_A): $(LIBHACL_BLAKE2_OBJS)
15181518
-rm -f $@
1519-
+$(AR) $(ARFLAGS) $@ $(LIBHACL_BLAKE2_OBJS)
1519+
$(AR) $(ARFLAGS) $@ $(LIBHACL_BLAKE2_OBJS)
15201520

15211521
Modules/_hacl/Hacl_HMAC.o: $(srcdir)/Modules/_hacl/Hacl_HMAC.c $(LIBHACL_HMAC_HEADERS)
1522-
+$(CC) -c $(LIBHACL_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Hacl_HMAC.c
1522+
$(CC) -c $(LIBHACL_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Hacl_HMAC.c
15231523

15241524
Modules/_hacl/Hacl_Streaming_HMAC.o: $(srcdir)/Modules/_hacl/Hacl_Streaming_HMAC.c $(LIBHACL_HMAC_HEADERS)
1525-
+$(CC) -Wno-unused-variable -c $(LIBHACL_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Hacl_Streaming_HMAC.c
1525+
$(CC) -Wno-unused-variable -c $(LIBHACL_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Hacl_Streaming_HMAC.c
15261526

15271527
$(LIBHACL_HMAC_A): $(LIBHACL_HMAC_OBJS)
15281528
-rm -f $@
1529-
+$(AR) $(ARFLAGS) $@ $(LIBHACL_HMAC_OBJS)
1529+
$(AR) $(ARFLAGS) $@ $(LIBHACL_HMAC_OBJS)
15301530

15311531
# create relative links from build/lib.platform/egg.so to Modules/egg.so
15321532
# pybuilddir.txt is created too late. We cannot use it in Makefile
@@ -1854,14 +1854,14 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \
18541854
$(MODOBJS) \
18551855
$(DTRACE_OBJS) \
18561856
$(srcdir)/Modules/getbuildinfo.c
1857-
+$(CC) -c $(PY_CORE_CFLAGS) \
1857+
$(CC) -c $(PY_CORE_CFLAGS) \
18581858
-DGITVERSION="\"`LC_ALL=C $(GITVERSION)`\"" \
18591859
-DGITTAG="\"`LC_ALL=C $(GITTAG)`\"" \
18601860
-DGITBRANCH="\"`LC_ALL=C $(GITBRANCH)`\"" \
18611861
-o $@ $(srcdir)/Modules/getbuildinfo.c
18621862

18631863
Modules/getpath.o: $(srcdir)/Modules/getpath.c Python/frozen_modules/getpath.h Makefile $(PYTHON_HEADERS)
1864-
+$(CC) -c $(PY_CORE_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \
1864+
$(CC) -c $(PY_CORE_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \
18651865
-DPREFIX='"$(host_prefix)"' \
18661866
-DEXEC_PREFIX='"$(host_exec_prefix)"' \
18671867
-DVERSION='"$(VERSION)"' \
@@ -1871,10 +1871,10 @@ Modules/getpath.o: $(srcdir)/Modules/getpath.c Python/frozen_modules/getpath.h M
18711871
-o $@ $(srcdir)/Modules/getpath.c
18721872

18731873
Programs/python.o: $(srcdir)/Programs/python.c
1874-
+$(CC) -c $(PY_CORE_CFLAGS) -o $@ $(srcdir)/Programs/python.c
1874+
$(CC) -c $(PY_CORE_CFLAGS) -o $@ $(srcdir)/Programs/python.c
18751875

18761876
Programs/_testembed.o: $(srcdir)/Programs/_testembed.c Programs/test_frozenmain.h $(PYTHON_HEADERS)
1877-
+$(CC) -c $(PY_CORE_CFLAGS) -o $@ $(srcdir)/Programs/_testembed.c
1877+
$(CC) -c $(PY_CORE_CFLAGS) -o $@ $(srcdir)/Programs/_testembed.c
18781878

18791879
Modules/_sre/sre.o: $(srcdir)/Modules/_sre/sre.c $(srcdir)/Modules/_sre/sre.h $(srcdir)/Modules/_sre/sre_constants.h $(srcdir)/Modules/_sre/sre_lib.h
18801880

@@ -1899,17 +1899,17 @@ Python/initconfig.o: $(srcdir)/Python/initconfig.c $(srcdir)/Python/config_commo
18991899
Python/interpconfig.o: $(srcdir)/Python/interpconfig.c $(srcdir)/Python/config_common.h
19001900

19011901
Python/dynload_shlib.o: $(srcdir)/Python/dynload_shlib.c Makefile
1902-
+$(CC) -c $(PY_CORE_CFLAGS) \
1902+
$(CC) -c $(PY_CORE_CFLAGS) \
19031903
-DSOABI='"$(SOABI)"' \
19041904
-o $@ $(srcdir)/Python/dynload_shlib.c
19051905

19061906
Python/dynload_hpux.o: $(srcdir)/Python/dynload_hpux.c Makefile
1907-
+$(CC) -c $(PY_CORE_CFLAGS) \
1907+
$(CC) -c $(PY_CORE_CFLAGS) \
19081908
-DSHLIB_EXT='"$(EXT_SUFFIX)"' \
19091909
-o $@ $(srcdir)/Python/dynload_hpux.c
19101910

19111911
Python/sysmodule.o: $(srcdir)/Python/sysmodule.c Makefile $(srcdir)/Include/pydtrace.h
1912-
+$(CC) -c $(PY_CORE_CFLAGS) \
1912+
$(CC) -c $(PY_CORE_CFLAGS) \
19131913
-DABIFLAGS='"$(ABIFLAGS)"' \
19141914
$(MULTIARCH_CPPFLAGS) \
19151915
-o $@ $(srcdir)/Python/sysmodule.c
@@ -2008,10 +2008,10 @@ regen-sre:
20082008
Python/compile.o Python/codegen.o Python/symtable.o Python/ast_unparse.o Python/ast.o Python/future.o: $(srcdir)/Include/internal/pycore_ast.h $(srcdir)/Include/internal/pycore_ast.h
20092009

20102010
Python/getplatform.o: $(srcdir)/Python/getplatform.c
2011-
+$(CC) -c $(PY_CORE_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c
2011+
$(CC) -c $(PY_CORE_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c
20122012

20132013
Python/importdl.o: $(srcdir)/Python/importdl.c
2014-
+$(CC) -c $(PY_CORE_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
2014+
$(CC) -c $(PY_CORE_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
20152015

20162016
Objects/unicodectype.o: $(srcdir)/Objects/unicodectype.c \
20172017
$(srcdir)/Objects/unicodetype_db.h
@@ -3045,7 +3045,7 @@ config.status: $(srcdir)/configure
30453045
.PRECIOUS: config.status $(BUILDPYTHON) Makefile Makefile.pre
30463046

30473047
Python/asm_trampoline.o: $(srcdir)/Python/asm_trampoline.S
3048-
+$(CC) -c $(PY_CORE_CFLAGS) -o $@ $<
3048+
$(CC) -c $(PY_CORE_CFLAGS) -o $@ $<
30493049

30503050

30513051
JIT_DEPS = \
@@ -3058,22 +3058,22 @@ jit_stencils.h: $(JIT_DEPS)
30583058
@REGEN_JIT_COMMAND@
30593059

30603060
Python/jit.o: $(srcdir)/Python/jit.c @JIT_STENCILS_H@
3061-
+$(CC) -c $(PY_CORE_CFLAGS) -o $@ $<
3061+
$(CC) -c $(PY_CORE_CFLAGS) -o $@ $<
30623062

30633063
.PHONY: regen-jit
30643064
regen-jit:
30653065
@REGEN_JIT_COMMAND@
30663066

30673067
# Some make's put the object file in the current directory
30683068
.c.o:
3069-
+$(CC) -c $(PY_CORE_CFLAGS) -o $@ $<
3069+
$(CC) -c $(PY_CORE_CFLAGS) -o $@ $<
30703070

30713071
# bpo-30104: dtoa.c uses union to cast double to unsigned long[2]. clang 4.0
30723072
# with -O2 or higher and strict aliasing miscompiles the ratio() function
30733073
# causing rounding issues. Compile dtoa.c using -fno-strict-aliasing on clang.
30743074
# https://bugs.llvm.org//show_bug.cgi?id=31928
30753075
Python/dtoa.o: Python/dtoa.c
3076-
+$(CC) -c $(PY_CORE_CFLAGS) $(CFLAGS_ALIASING) -o $@ $<
3076+
$(CC) -c $(PY_CORE_CFLAGS) $(CFLAGS_ALIASING) -o $@ $<
30773077

30783078
# Run reindent on the library
30793079
.PHONY: reindent

‎Modules/makesetup‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -228,13 +228,13 @@ sed -e 's/[ ]*#.*//' -e '/^[ ]*$/d' |
228228
for src in $srcs
229229
do
230230
case $src in
231-
*.c) obj=`basename $src .c`.o; cc='+$(CC)';;
232-
*.cc) obj=`basename $src .cc`.o; cc='+$(CXX)';;
233-
*.c++) obj=`basename $src .c++`.o; cc='+$(CXX)';;
234-
*.C) obj=`basename $src .C`.o; cc='+$(CXX)';;
235-
*.cxx) obj=`basename $src .cxx`.o; cc='+$(CXX)';;
236-
*.cpp) obj=`basename $src .cpp`.o; cc='+$(CXX)';;
237-
*.m) obj=`basename $src .m`.o; cc='+$(CC)';; # Obj-C
231+
*.c) obj=`basename $src .c`.o; cc='$(CC)';;
232+
*.cc) obj=`basename $src .cc`.o; cc='$(CXX)';;
233+
*.c++) obj=`basename $src .c++`.o; cc='$(CXX)';;
234+
*.C) obj=`basename $src .C`.o; cc='$(CXX)';;
235+
*.cxx) obj=`basename $src .cxx`.o; cc='$(CXX)';;
236+
*.cpp) obj=`basename $src .cpp`.o; cc='$(CXX)';;
237+
*.m) obj=`basename $src .m`.o; cc='$(CC)';; # Obj-C
238238
*) continue;;
239239
esac
240240
case $src in

0 commit comments

Comments
 (0)