aboutsummaryrefslogtreecommitdiffhomepage
path: root/Makefile
diff options
context:
space:
mode:
authorAyke van Laethem <[email protected]>2022-01-19 14:58:11 +0100
committerRon Evans <[email protected]>2022-02-03 18:28:02 +0100
commit372d9e0f5e6db1b146b1544933bf5da24eb2d69a (patch)
treeb99b3212f1faa32aa3abbc82f0c99b492966f377 /Makefile
parentd139fa5e0f330a6ee6a86b496d82023d896ac18a (diff)
downloadtinygo-372d9e0f5e6db1b146b1544933bf5da24eb2d69a.tar.gz
tinygo-372d9e0f5e6db1b146b1544933bf5da24eb2d69a.zip
wasm: remove heap allocator from wasi-libc
This would conflict with our own heap. We previously defined all those functions to make sure it's not used, but with a more recent wasi-libc version (https://github.com/WebAssembly/wasi-libc/pull/250) we can simply not compile the wasi-libc heap, which is the proper fix.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 2cde9de6e..bbce72fdd 100644
--- a/Makefile
+++ b/Makefile
@@ -200,7 +200,7 @@ endif
wasi-libc: lib/wasi-libc/sysroot/lib/wasm32-wasi/libc.a
lib/wasi-libc/sysroot/lib/wasm32-wasi/libc.a:
@if [ ! -e lib/wasi-libc/Makefile ]; then echo "Submodules have not been downloaded. Please download them using:\n git submodule update --init"; exit 1; fi
- cd lib/wasi-libc && make -j4 WASM_CFLAGS="-O2 -g -DNDEBUG" WASM_CC=$(CLANG) WASM_AR=$(LLVM_AR) WASM_NM=$(LLVM_NM)
+ cd lib/wasi-libc && make -j4 WASM_CFLAGS="-O2 -g -DNDEBUG" MALLOC_IMPL=none WASM_CC=$(CLANG) WASM_AR=$(LLVM_AR) WASM_NM=$(LLVM_NM)
# Build the Go compiler.