diff options
| author | Christian Heimes <christian@python.org> | 2022-06-18 12:51:50 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-18 12:51:50 (GMT) |
| commit | 7a2cc35e1ca6808a735b90269756d5286077a152 (patch) | |
| tree | d084059e09202e9e0f7f3b3298ac06491ca8acfe /Makefile.pre.in | |
| parent | f9433fff476aa13af9cb314fcc6962055faa4085 (diff) | |
| download | cpython-7a2cc35e1ca6808a735b90269756d5286077a152.zip cpython-7a2cc35e1ca6808a735b90269756d5286077a152.tar.gz cpython-7a2cc35e1ca6808a735b90269756d5286077a152.tar.bz2 | |
gh-84461: Fix pydebug Emscripten browser builds (GH-93982)
wasm_assets script did not take the ABIFLAG flag of sysconfigdata into
account.
Diffstat (limited to 'Makefile.pre.in')
| -rw-r--r-- | Makefile.pre.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 265a9e4..f9bc973 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -247,8 +247,8 @@ SRCDIRS= @SRCDIRS@ SUBDIRSTOO= Include Lib Misc # assets for Emscripten browser builds -WASM_ASSETS_DIR=".$(prefix)" -WASM_STDLIB="$(WASM_ASSETS_DIR)/local/lib/python$(VERSION)/os.py" +WASM_ASSETS_DIR=.$(prefix) +WASM_STDLIB=$(WASM_ASSETS_DIR)/lib/python$(VERSION)/os.py # Files and directories to be distributed CONFIGFILES= configure configure.ac acconfig.h pyconfig.h.in Makefile.pre.in @@ -821,7 +821,7 @@ $(WASM_STDLIB): $(srcdir)/Lib/*.py $(srcdir)/Lib/*/*.py \ Makefile pybuilddir.txt Modules/Setup.local \ python.html python.worker.js $(PYTHON_FOR_BUILD) $(srcdir)/Tools/wasm/wasm_assets.py \ - --builddir . --prefix $(prefix) + --buildroot . --prefix $(prefix) python.html: $(srcdir)/Tools/wasm/python.html python.worker.js @cp $(srcdir)/Tools/wasm/python.html $@ @@ -2391,7 +2391,7 @@ clean-retain-profile: pycremoval -rm -f Lib/lib2to3/*Grammar*.pickle -rm -f _bootstrap_python -rm -f python.html python*.js python.data python*.symbols python*.map - -rm -rf $(WASM_STDLIB) + -rm -f $(WASM_STDLIB) -rm -f Programs/_testembed Programs/_freeze_module -rm -f Python/deepfreeze/*.[co] -rm -f Python/frozen_modules/*.h |