DoneJS/quickjs-done-nextgen
1
0
Fork 0
mirror of https://github.com/DoneJS-Runtime/quickjs-done-nextgen.git synced 2025-01-09 17:43:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix compilation of quickjs-libc under emscripten (#773)

Browse source
This commit is contained in:
Andrew Johnson 2024-12-27 23:37:34 +08:00 committed by GitHub
parent 482291286b
commit 8d88f320fb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View file

@ -398,7 +398,7 @@ jobs:
run: emcc -v run: emcc -v
- name: build - name: build
run: | run: |
emcmake cmake -B build emcmake cmake -B build -DBUILD_QJS_LIBC=ON
emmake make -C build qjs_wasm -j$(getconf _NPROCESSORS_ONLN) emmake make -C build qjs_wasm -j$(getconf _NPROCESSORS_ONLN)
- name: result - name: result
run: ls -lh build run: ls -lh build

10
quickjs-libc.c
View file

@ -3035,15 +3035,19 @@ static int my_execvpe(const char *filename, char **argv, char **envp)
return -1; return -1;
} }
static js_once_t js_os_exec_once = JS_ONCE_INIT;
static void (*js_os_exec_closefrom)(int); static void (*js_os_exec_closefrom)(int);
#if !defined(EMSCRIPTEN) && !defined(__wasi__)
static js_once_t js_os_exec_once = JS_ONCE_INIT;
static void js_os_exec_once_init(void) static void js_os_exec_once_init(void)
{ {
js_os_exec_closefrom = dlsym(RTLD_DEFAULT, "closefrom"); js_os_exec_closefrom = dlsym(RTLD_DEFAULT, "closefrom");
} }
#endif
/* exec(args[, options]) -> exitcode */ /* exec(args[, options]) -> exitcode */
static JSValue js_os_exec(JSContext *ctx, JSValue this_val, static JSValue js_os_exec(JSContext *ctx, JSValue this_val,
int argc, JSValue *argv) int argc, JSValue *argv)
@ -3163,9 +3167,11 @@ static JSValue js_os_exec(JSContext *ctx, JSValue this_val,
} }
} }
#if !defined(EMSCRIPTEN) && !defined(__wasi__)
// should happen pre-fork because it calls dlsym() // should happen pre-fork because it calls dlsym()
// and that's not an async-signal-safe function // and that's not an async-signal-safe function
js_once(&js_os_exec_once, js_os_exec_once_init); js_once(&js_os_exec_once, js_os_exec_once_init);
#endif
pid = fork(); pid = fork();
if (pid < 0) { if (pid < 0) {