Skip to content

Fix compilation of quickjs-libc under emscripten #773

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 27, 2024
Merged

Fix compilation of quickjs-libc under emscripten #773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b36c4d
Fix compilation of quickjs-libc under emscripten
andrjohns Dec 27, 2024
336eb2d
Match WASM guard to cutils
andrjohns Dec 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ jobs:
run: emcc -v
- name: build
run: |
emcmake cmake -B build
emcmake cmake -B build -DBUILD_QJS_LIBC=ON
emmake make -C build qjs_wasm -j$(getconf _NPROCESSORS_ONLN)
- name: result
run: ls -lh build
Expand Down
10 changes: 8 additions & 2 deletions quickjs-libc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3035,15 +3035,19 @@ static int my_execvpe(const char *filename, char **argv, char **envp)
return -1;
}

static js_once_t js_os_exec_once = JS_ONCE_INIT;

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)
{
js_os_exec_closefrom = dlsym(RTLD_DEFAULT, "closefrom");
}

#endif

/* exec(args[, options]) -> exitcode */
static JSValue js_os_exec(JSContext *ctx, JSValue this_val,
int argc, JSValue *argv)
Expand Down Expand Up @@ -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()
// and that's not an async-signal-safe function
js_once(&js_os_exec_once, js_os_exec_once_init);
#endif

pid = fork();
if (pid < 0) {
Expand Down
Loading