Skip to content

Commit 3f3bf8e

Browse files
committed
3.1.70.2bi
1 parent c2e6ecf commit 3f3bf8e

File tree

3 files changed

+32
-104
lines changed

3 files changed

+32
-104
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-22.04
2020
env:
2121
BUILDS: 3.12 3.13 3.14
22-
EMFLAVOUR: latest
22+
EMFLAVOUR: tot
2323

2424
steps:
2525
- uses: actions/[email protected]

emsdk-cc

Lines changed: 31 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -245,21 +245,41 @@ if CONFIGURE and len(out) == 1:
245245
if SKIP:
246246
final.extend(sys.argv)
247247
else:
248-
if EXE.endswith(".cjs") or EXE.endswith(".js"):
249-
250-
def make_exe(*argv, **kw):
251-
global CONFIGURE
252-
if os.path.isfile(EXE) and not CONFIGURE:
253-
with open(EXE, "r") as file:
254-
bin = file.read()
255-
with open(EXE, "w") as file:
256-
file.write("#!/usr/bin/env node\n")
257-
file.write(bin)
258-
os.chmod(EXE, 0o766)
248+
# should not happen
249+
if EXE:
250+
if EXE.endswith('.o') and '-c' not in out:
251+
final.append('-c')
252+
EXE = False
253+
MAIN_MODULE = False
254+
255+
if EXE:
256+
if EXE.endswith(".cjs") or EXE.endswith(".js"):
257+
def make_exe(*argv, **kw):
258+
global CONFIGURE
259+
if os.path.isfile(EXE) and not CONFIGURE:
260+
with open(EXE, "r") as file:
261+
bin = file.read()
262+
with open(EXE, "w") as file:
263+
file.write("#!/usr/bin/env node\n")
264+
file.write(bin)
265+
os.chmod(EXE, 0o766)
266+
# the build system is old and exe has no suffix from cmake or configure
267+
else:
268+
def make_exe(*argv, **kw):
269+
global CONFIGURE
270+
if os.path.isfile(EXE) and os.path.isfile(EXE+'.wasm') and not CONFIGURE:
271+
os.rename(EXE, EXE+".cjs")
272+
with open(EXE, "w") as file:
273+
file.write("#!/usr/bin/env bash\n")
274+
file.write('node $0.cjs "$@"\n')
275+
os.chmod(EXE, 0o766)
259276

260277
final.append("-sENVIRONMENT=node")
278+
final.append("-sEXIT_RUNTIME")
261279
if USE_RAWFS:
280+
#final.append("-sASYNCIFY")
262281
final.append("-sNODERAWFS")
282+
263283
__import__("atexit").register(make_exe)
264284

265285
# do not pass WASM opts when -c/-o but always PIC and opt level

sources.off/ncurses.sh

Lines changed: 0 additions & 92 deletions
This file was deleted.

0 commit comments

Comments
 (0)