|
- diff -Naur Python-3.8.0-orig/Makefile.pre.in Python-3.8.0/Makefile.pre.in
- --- Python-3.8.0-orig/Makefile.pre.in 2019-10-22 10:04:44.812737000 +0300
- +++ Python-3.8.0/Makefile.pre.in 2019-10-22 10:04:51.177548200 +0300
- @@ -249,6 +249,7 @@
-
- PYTHON= python$(EXE)
- BUILDPYTHON= python$(BUILDEXE)
- +BUILDPYTHONW= pythonw$(BUILDEXE)
-
- PYTHON_FOR_REGEN=@PYTHON_FOR_REGEN@
- UPDATE_FILE=@PYTHON_FOR_REGEN@ $(srcdir)/Tools/scripts/update_file.py
- @@ -272,6 +272,8 @@ COVERAGE_INFO= $(abs_builddir)/coverage.info
- COVERAGE_REPORT=$(abs_builddir)/lcov-report
- COVERAGE_REPORT_OPTIONS=--no-branch-coverage --title "CPython lcov report"
-
- +# tool to generate windows resource files
- +WINDRES?= windres
-
- # === Definitions added by makesetup ===
-
- @@ -455,7 +456,7 @@
-
- # Default target
- all: @DEF_MAKE_ALL_RULE@
- -build_all: check-clean-src $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks \
- +build_all: check-clean-src $(BUILDPYTHON) $(BUILDPYTHONW) oldsharedmods sharedmods gdbhooks \
- Programs/_testembed python-config
-
- # Check that the source is clean when building out of source.
- @@ -569,9 +570,27 @@
- clinic: check-clean-src $(srcdir)/Modules/_blake2/blake2s_impl.c
- $(PYTHON_FOR_REGEN) $(srcdir)/Tools/clinic/clinic.py --make --srcdir $(srcdir)
-
- +pythonnt_rc.h:
- + # FIXME: FIELD3 not set
- + @echo '#define FIELD3 0' > $@
- + @echo '#define MS_DLL_ID "$(VERSION)"' >> $@
- + @echo '#define PYTHON_DLL_NAME "$(DLLLIBRARY)"' >> $@
- +
- +python_exe.o: pythonnt_rc.h $(srcdir)/PC/python_exe.rc
- + $(WINDRES) -I$(srcdir)/Include -I$(srcdir)/PC -I. $(srcdir)/PC/python_exe.rc $@
- +
- +pythonw_exe.o: pythonnt_rc.h $(srcdir)/PC/pythonw_exe.rc
- + $(WINDRES) -I$(srcdir)/Include -I$(srcdir)/PC -I. $(srcdir)/PC/pythonw_exe.rc $@
- +
- +python_nt.o: pythonnt_rc.h $(srcdir)/PC/python_nt.rc
- + $(WINDRES) -I$(srcdir)/Include -I$(srcdir)/PC -I. $(srcdir)/PC/python_nt.rc $@
- +
- +$(BUILDPYTHONW): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) pythonw_exe.o
- + $(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -municode -mwindows -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) pythonw_exe.o
- +
- # Build the interpreter
- -$(BUILDPYTHON): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
- - $(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS)
- +$(BUILDPYTHON): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) python_exe.o
- + $(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -municode -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) python_exe.o
-
- platform: $(BUILDPYTHON) pybuilddir.txt
- $(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print("%s-%d.%d" % (get_platform(), *sys.version_info[:2]))' >platform
- @@ -677,10 +696,10 @@
-
- # This rule builds the Cygwin Python DLL and import library if configured
- # for a shared core library; otherwise, this rule is a noop.
- -$(DLLLIBRARY) libpython$(LDVERSION).dll.a: $(LIBRARY_OBJS)
- +$(DLLLIBRARY) libpython$(LDVERSION).dll.a: $(LIBRARY_OBJS) python_nt.o
- if test -n "$(DLLLIBRARY)"; then \
- $(LDSHARED) -Wl,--out-implib=$@ -o $(DLLLIBRARY) $^ \
- - $(LIBS) $(MODLIBS) $(SYSLIBS); \
- + $(LIBS) $(MODLIBS) $(SYSLIBS) python_nt.o; \
- else true; \
- fi
-
- @@ -1246,6 +1265,7 @@
- done
- if test "$(PYTHONFRAMEWORKDIR)" = "no-framework" ; then \
- $(INSTALL_PROGRAM) $(BUILDPYTHON) $(DESTDIR)$(BINDIR)/python$(LDVERSION)$(EXE); \
- + $(INSTALL_PROGRAM) $(BUILDPYTHONW) $(DESTDIR)$(BINDIR)/python3w$(EXE); \
- else \
- $(INSTALL_PROGRAM) $(STRIPFLAG) Mac/pythonw $(DESTDIR)$(BINDIR)/python$(LDVERSION)$(EXE); \
- fi
|
