| From 6e9ed94084c501600e2ba6fdaac4b49b252e654d Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= |
| <alexey.pawlow@gmail.com> |
| Date: Thu, 17 Jun 2021 18:51:57 +0530 |
| Subject: [PATCH 051/N] builddir fixes |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| Co-authored-by: Алексей <alexey.pawlow@gmail.com> |
| Co-authored-by: Christoph Reiter <reiter.christoph@gmail.com> |
| --- |
| Makefile.pre.in | 10 +++++----- |
| Programs/_freeze_importlib.c | 2 +- |
| 2 files changed, 6 insertions(+), 6 deletions(-) |
| |
| diff --git a/Makefile.pre.in b/Makefile.pre.in |
| index 72be72d..7badeec 100644 |
| --- a/Makefile.pre.in |
| +++ b/Makefile.pre.in |
| @@ -741,20 +741,20 @@ Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) |
| |
| Programs/_freeze_importlib.o: Programs/_freeze_importlib.c Makefile |
| |
| -Programs/_freeze_importlib: Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) |
| +Programs/_freeze_importlib$(EXE): Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) |
| $(LINKCC) $(PY_CORE_LDFLAGS) -o $@ Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) $(LIBS) $(MODLIBS) $(SYSLIBS) |
| |
| .PHONY: regen-importlib |
| -regen-importlib: Programs/_freeze_importlib |
| +regen-importlib: Programs/_freeze_importlib$(EXE) |
| # Regenerate Python/importlib_external.h |
| # from Lib/importlib/_bootstrap_external.py using _freeze_importlib |
| - ./Programs/_freeze_importlib importlib._bootstrap_external \ |
| + ./Programs/_freeze_importlib$(EXE) importlib._bootstrap_external \ |
| $(srcdir)/Lib/importlib/_bootstrap_external.py \ |
| $(srcdir)/Python/importlib_external.h.new |
| $(UPDATE_FILE) $(srcdir)/Python/importlib_external.h $(srcdir)/Python/importlib_external.h.new |
| # Regenerate Python/importlib.h from Lib/importlib/_bootstrap.py |
| # using _freeze_importlib |
| - ./Programs/_freeze_importlib importlib._bootstrap \ |
| + ./Programs/_freeze_importlib$(EXE) importlib._bootstrap \ |
| $(srcdir)/Lib/importlib/_bootstrap.py \ |
| $(srcdir)/Python/importlib.h.new |
| $(UPDATE_FILE) $(srcdir)/Python/importlib.h $(srcdir)/Python/importlib.h.new |
| @@ -1882,7 +1882,7 @@ clean-retain-profile: pycremoval |
| find build -name '*.py[co]' -exec rm -f {} ';' || true |
| -rm -f pybuilddir.txt |
| -rm -f Lib/lib2to3/*Grammar*.pickle |
| - -rm -f Programs/_testembed Programs/_freeze_importlib |
| + -rm -f Programs/_testembed Programs/_freeze_importlib$(EXE) |
| -find build -type f -a ! -name '*.gc??' -exec rm -f {} ';' |
| -rm -f Include/pydtrace_probes.h |
| -rm -f profile-gen-stamp |
| diff --git a/Programs/_freeze_importlib.c b/Programs/_freeze_importlib.c |
| index 2e4ccbb..a8d5c31 100644 |
| --- a/Programs/_freeze_importlib.c |
| +++ b/Programs/_freeze_importlib.c |
| @@ -20,7 +20,7 @@ static const struct _frozen _PyImport_FrozenModules[] = { |
| {0, 0, 0} /* sentinel */ |
| }; |
| |
| -#ifndef MS_WINDOWS |
| +#ifndef _MSC_VER |
| /* On Windows, this links with the regular pythonXY.dll, so this variable comes |
| from frozen.obj. In the Makefile, frozen.o is not linked into this executable, |
| so we define the variable here. */ |
| -- |
| 2.32.0 |
| |
