Skip to content

Commit a719b3f

Browse files
committed
3.1.74.4 pre
1 parent 7b82657 commit a719b3f

File tree

3 files changed

+20
-13
lines changed

3 files changed

+20
-13
lines changed

emsdk-cc

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ COMMON = arglist(
6565
false = False
6666
true = True
6767

68-
PY_MODULE = IS_SHARED = false
68+
TOGGLED_SHARED = PY_MODULE = IS_SHARED = false
6969
SHARED_TARGET = SHARED = ""
7070

7171
MVP = env("MVP", true)
@@ -267,8 +267,9 @@ else:
267267
continue
268268

269269
if arg.find("wasm32-emscripten.so") > 0 or arg.find("abi3.so") > 0:
270-
PY_MODULE = true
270+
PY_MODULE = True
271271
SHARED_TARGET = arg
272+
IS_SHARED = True
272273

273274
# FIX linking .so when it should have been .a for final exe without MAIN_MODULE set
274275
# should be "LINKING" state
@@ -285,9 +286,9 @@ else:
285286
# TODO check is -shared implies -sSIDE_MODULE=1
286287
elif arg == "-shared":
287288
IS_SHARED = True
288-
SHARED = f"-shared -sASSERTIONS=0 -sSIDE_MODULE=1 -L{os.environ['PREFIX']}/lib"
289289
continue
290290

291+
291292
# duplicates can happen on cmake/rustc but they are expected to be here for a reason so skip them
292293
if not (CMAKE or NINJA or RUSTC):
293294
# prevent duplicates objects/archives files on cmdline when linking
@@ -408,14 +409,19 @@ else:
408409
if SIZEOPT and ("-sENVIRONMENT=web" not in out):
409410
final.append("-sENVIRONMENT=web")
410411

412+
413+
if IS_SHARED and not TOGGLED_SHARED:
414+
TOGGLED_SHARED = True
415+
SHARED = f"-shared -sASSERTIONS=0 -sSIDE_MODULE=1 -L{PREFIX}/lib"
416+
417+
411418
# maybe not pass all WASM opts when -c + -o but always PIC and opt level
412419
final.extend(arglist("-fPIC", SHARED, COPTS))
413420

414421
# prevent use of extended instr
415422
final.extend(CPU)
416423

417424
if IS_SHARED or LINKING:
418-
# , "-gsource-map --source-map-base /"))
419425
final.append(f"-L{PREFIX}/lib")
420426
final.extend(arglist(WASM_EXTRA, env("LDFLAGS", "")))
421427
else:

scripts/cpython-build-emsdk.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ ac_cv_func_dlopen=yes
163163
ac_cv_lib_ffi_ffi_call=yes
164164
py_cv_module__ctypes=yes
165165
py_cv_module__ctypes_test=yes
166+
ax_cv_c_float_words_bigendian=no
166167
END
167168

168169

scripts/cpython-fetch.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ fi
4444

4545
if echo $PYBUILD |grep -q 14$
4646
then
47-
wget -c https://www.python.org/ftp/python/3.14.0/Python-3.14.0a2.tar.xz
48-
tar xf Python-3.14.0a2.tar.xz
49-
ln -s Python-3.14.0a2 cpython${PYBUILD}
47+
wget -c https://www.python.org/ftp/python/3.14.0/Python-3.14.0a4.tar.xz
48+
tar xf Python-3.14.0a4.tar.xz
49+
ln -s Python-3.14.0a4 cpython${PYBUILD}
5050

5151
mkdir $ROOT/devices/emsdk/usr/lib $ROOT/devices/$(arch)/usr/lib -p
5252

@@ -125,17 +125,17 @@ fi
125125

126126
if echo $PYBUILD |grep -q 12$
127127
then
128-
wget -q -c https://www.python.org/ftp/python/3.12.7/Python-3.12.7.tar.xz
129-
tar xf Python-3.12.7.tar.xz
130-
ln -s Python-3.12.7 cpython${PYBUILD}
128+
wget -q -c https://www.python.org/ftp/python/3.12.8/Python-3.12.8.tar.xz
129+
tar xf Python-3.12.8.tar.xz
130+
ln -s Python-3.12.8 cpython${PYBUILD}
131131
fi
132132

133133

134134
if echo $PYBUILD | grep -q 11$
135135
then
136-
wget -q -c https://www.python.org/ftp/python/3.11.10/Python-3.11.10.tar.xz
137-
tar xf Python-3.11.10.tar.xz
138-
ln -s Python-3.11.10 cpython${PYBUILD}
136+
wget -q -c https://www.python.org/ftp/python/3.11.11/Python-3.11.11.tar.xz
137+
tar xf Python-3.11.11.tar.xz
138+
ln -s Python-3.11.11 cpython${PYBUILD}
139139
fi
140140

141141
popd

0 commit comments

Comments
 (0)