Skip to content

Commit 21c6f3e

Browse files
committed
gh-145176 Move Emscripten files into Platforms/emscripten
1 parent bdf6de8 commit 21c6f3e

20 files changed

Lines changed: 7 additions & 7 deletions

Makefile.pre.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1103,7 +1103,7 @@ $(DLLLIBRARY) libpython$(LDVERSION).dll.a: $(LIBRARY_OBJS)
11031103

11041104
# wasm32-emscripten browser web example
11051105

1106-
EMSCRIPTEN_DIR=$(srcdir)/Tools/wasm/emscripten
1106+
EMSCRIPTEN_DIR=$(srcdir)/Platforms/emscripten
11071107
WEBEX_DIR=$(EMSCRIPTEN_DIR)/web_example/
11081108

11091109
ZIP_STDLIB=python$(VERSION)$(ABI_THREAD).zip
@@ -3174,7 +3174,7 @@ Python/emscripten_trampoline_inner.wasm: $(srcdir)/Python/emscripten_trampoline_
31743174
$$(dirname $$(dirname $(CC)))/bin/clang -o $@ $< -mgc -O2 -Wl,--no-entry -Wl,--import-table -Wl,--import-memory -target wasm32-unknown-unknown -nostdlib
31753175

31763176
Python/emscripten_trampoline_wasm.c: Python/emscripten_trampoline_inner.wasm
3177-
$(PYTHON_FOR_REGEN) $(srcdir)/Tools/wasm/emscripten/prepare_external_wasm.py $< $@ getWasmTrampolineModule
3177+
$(PYTHON_FOR_REGEN) $(srcdir)/Platforms/emscripten/prepare_external_wasm.py $< $@ getWasmTrampolineModule
31783178

31793179
JIT_DEPS = \
31803180
$(srcdir)/Tools/jit/*.c \
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525

2626
EMSCRIPTEN_DIR = Path(__file__).parent
27-
CHECKOUT = EMSCRIPTEN_DIR.parent.parent.parent
27+
CHECKOUT = EMSCRIPTEN_DIR.parent.parent
2828
CONFIG_FILE = EMSCRIPTEN_DIR / "config.toml"
2929

3030
DEFAULT_CROSS_BUILD_DIR = CHECKOUT / "cross-build"
@@ -74,7 +74,7 @@ def get_build_paths(cross_build_dir=None, emsdk_cache=None):
7474

7575

7676
LOCAL_SETUP = CHECKOUT / "Modules" / "Setup.local"
77-
LOCAL_SETUP_MARKER = b"# Generated by Tools/wasm/emscripten.py\n"
77+
LOCAL_SETUP_MARKER = b"# Generated by Platforms/wasm/emscripten.py\n"
7878

7979

8080
def validate_emsdk_version(emsdk_cache):
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

Tools/wasm/emscripten/browser_test/playwright.config.ts renamed to Platforms/emscripten/browser_test/playwright.config.ts

File renamed without changes.
File renamed without changes.

Tools/wasm/emscripten/config.site-wasm32-emscripten renamed to Platforms/emscripten/config.site-wasm32-emscripten

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# config.site override for cross compiling to wasm32-emscripten platform
22
#
3-
# CONFIG_SITE=Tools/wasm/emscripten/config.site-wasm32-emscripten \
3+
# CONFIG_SITE=Platforms/wasm/emscripten/config.site-wasm32-emscripten \
44
# emconfigure ./configure --host=wasm32-unknown-emscripten --build=...
55
#
66
# Written by Christian Heimes <christian@python.org>

0 commit comments

Comments
 (0)