diff --git a/Dockerfile b/Dockerfile index f6c72122..e21b29ad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,8 @@ COPY --from=tinygo-base /tinygo/targets /tinygo/targets RUN cd /tinygo/ && \ apt-get update && \ - apt-get install -y make clang-11 libllvm11 lld-11 && \ + apt-get install -y make clang-11 libllvm11 lld-11 cmake ninja-build && \ + mkdir build && \ make wasi-libc binaryen # tinygo-avr stage installs the needed dependencies to compile TinyGo programs for AVR microcontrollers. diff --git a/Makefile b/Makefile index aaabc2e8..a3403f5e 100644 --- a/Makefile +++ b/Makefile @@ -54,7 +54,7 @@ ifeq ($(OS),Windows_NT) CGO_LDFLAGS += -static -static-libgcc -static-libstdc++ CGO_LDFLAGS_EXTRA += -lversion - BINARYEN_OPTION += -DCMAKE_EXE_LINKER_FLAGS='-static-libgcc -static-libstdc++' + BINARYEN_OPTION += -DCMAKE_EXE_LINKER_FLAGS='-static-libgcc -static-libstdc++' LIBCLANG_NAME = libclang