bpo-45582: Fix out-of-tree build issues with new getpath (GH-29902) · python/cpython@ccb73a0

GitHub

Original file line numberDiff line numberDiff line change@@ -1062,10 +1062,9 @@ FROZEN_FILES_OUT = \

10621062Programs/_freeze_module.o: Programs/_freeze_module.c Makefile

1063106310641064Modules/getpath_noop.o: $(srcdir)/Modules/getpath_noop.c Makefile

1065- $(CC) -c $(PY_CORE_CFLAGS) -o $@ $(srcdir)/Modules/getpath_noop.c

106610651067-Programs/_freeze_module: Programs/_freeze_module.o $(LIBRARY_OBJS_OMIT_FROZEN) Modules/getpath_noop.o

1068- $(LINKCC) $(PY_CORE_LDFLAGS) -o $@ Programs/_freeze_module.o $(LIBRARY_OBJS_OMIT_FROZEN) Modules/getpath_noop.o $(LIBS) $(MODLIBS) $(SYSLIBS)

1066+Programs/_freeze_module: Programs/_freeze_module.o Modules/getpath_noop.o $(LIBRARY_OBJS_OMIT_FROZEN)

1067+ $(LINKCC) $(PY_CORE_LDFLAGS) -o $@ Programs/_freeze_module.o Modules/getpath_noop.o $(LIBRARY_OBJS_OMIT_FROZEN) $(LIBS) $(MODLIBS) $(SYSLIBS)

1069106810701069# BEGIN: freezing modules

10711070@@ -1131,11 +1130,11 @@ Python/frozen_modules/frozen_only.h: $(FREEZE_MODULE) Tools/freeze/flag.py

1131113011321131# END: freezing modules

113311321134-Tools/scripts/freeze_modules.py: $(FREEZE_MODULE)

1135-11361133# We manually freeze getpath.py rather than through freeze_modules

1137-Modules/getpath.h: Programs/_freeze_module Modules/getpath.py

1138- Programs/_freeze_module getpath $(srcdir)/Modules/getpath.py $(srcdir)/Modules/getpath.h

1134+Python/frozen_modules/getpath.h: $(FREEZE_MODULE) Modules/getpath.py

1135+ $(FREEZE_MODULE) getpath $(srcdir)/Modules/getpath.py Python/frozen_modules/getpath.h

1136+1137+Tools/scripts/freeze_modules.py: $(FREEZE_MODULE)

1139113811401139.PHONY: regen-frozen

11411140regen-frozen: Tools/scripts/freeze_modules.py $(FROZEN_FILES_IN)

@@ -1177,7 +1176,7 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \

11771176 -DGITBRANCH="\"`LC_ALL=C $(GITBRANCH)`\"" \

11781177 -o $@ $(srcdir)/Modules/getbuildinfo.c

117911781180-Modules/getpath.o: $(srcdir)/Modules/getpath.c Modules/getpath.h Makefile

1179+Modules/getpath.o: $(srcdir)/Modules/getpath.c Python/frozen_modules/getpath.h Makefile $(PYTHON_HEADERS)

11811180 $(CC) -c $(PY_CORE_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \

11821181 -DPREFIX='"$(prefix)"' \

11831182 -DEXEC_PREFIX='"$(exec_prefix)"' \