fix wasm build

Forwarded: not-needed
Reviewed-By: Yadd <yadd@debian.org>
Last-Update: 2024-04-05

Gbp-Pq: Name fix-wasm-build.patch

diff --git a/llhttp/Makefile b/llhttp/Makefile
index d9c6d35d8c231f4492f0b2a4e25ddfe42d2828d1..f3afeba481e29b9f69df6e58edc158f9456f01bf 100644 (file)
--- a/llhttp/Makefile
+++ b/llhttp/Makefile
@@ -81,7 +81,7 @@ postversion: release
        git checkout main
 
 generate:
-       npx ts-node bin/generate.ts
+       ts-node bin/generate.ts
 
 install: build/libllhttp.a build/libllhttp.so
        $(INSTALL) -d $(DESTDIR)$(INCLUDEDIR)

diff --git a/llhttp/bin/build_wasm.ts b/llhttp/bin/build_wasm.ts
index 95c1ceda691320e9c082fe8e03d17b36b5e0bfdc..d6183b58501cd4d183612aa7ea60da66c61f6888 100644 (file)
--- a/llhttp/bin/build_wasm.ts
+++ b/llhttp/bin/build_wasm.ts
@@ -25,6 +25,7 @@ if (process.argv[2] === '--setup') {
     mkdirSync(join(WASM_SRC, 'build'));
     process.exit(0);
   } catch (error: unknown) {
+// @ts-ignore
     if (isErrorWithCode(error) && error.code !== 'EEXIST') {
       throw error;
     }
@@ -52,6 +53,7 @@ if (process.argv[2] === '--docker') {
 try {
   mkdirSync(WASM_OUT);
 } catch (error: unknown) {
+// @ts-ignore
   if (isErrorWithCode(error) && error.code !== 'EEXIST') {
     throw error;
   }
@@ -63,12 +65,14 @@ execSync('npm run build', { cwd: WASM_SRC, stdio: 'inherit' });
 // Build wasm binary
 execSync(
   `clang \
- --sysroot=/usr/share/wasi-sysroot \
+ -nodefaultlibs \
+ --sysroot=/usr \
  -target wasm32-unknown-wasi \
  -Ofast \
  -fno-exceptions \
  -fvisibility=hidden \
  -mexec-model=reactor \
+ -Wl,-lc \
  -Wl,-error-limit=0 \
  -Wl,-O3 \
  -Wl,--lto-O3 \