summaryrefslogtreecommitdiffhomepage
path: root/pkg/docker
diff options
context:
space:
mode:
authorAndrew Clayton <a.clayton@nginx.com>2024-02-21 12:59:38 +0000
committerAndrew Clayton <a.clayton@nginx.com>2024-02-21 16:20:32 +0000
commit1297f6f0f4e538b5d068657be66ae416ea095ce6 (patch)
tree76aff5871dbd374792cab1817216cf108bad10e8 /pkg/docker
parent7702293dda8ed73cd2cc616f9a339212b4386707 (diff)
downloadunit-1297f6f0f4e538b5d068657be66ae416ea095ce6.tar.gz
unit-1297f6f0f4e538b5d068657be66ae416ea095ce6.tar.bz2
Docker: Add wasm-wasi-component to the wasm target
Thus $ make build-wasm will build _both_ the 'wasm' & 'wasm-wasi-component' modules. Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
Diffstat (limited to '')
-rw-r--r--pkg/docker/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/pkg/docker/Makefile b/pkg/docker/Makefile
index c7a5f1ee..d8c53021 100644
--- a/pkg/docker/Makefile
+++ b/pkg/docker/Makefile
@@ -77,9 +77,10 @@ MODULE_PREBUILD_ruby ?= /bin/true
VERSIONS_wasm ?=
CONTAINER_wasm ?= debian:$(VARIANT)-slim
-CONFIGURE_wasm ?= wasm --include-path=\`pwd\`/pkg/contrib/wasmtime/crates/c-api/include --lib-path=/usr/lib/\$$(dpkg-architecture -q DEB_HOST_MULTIARCH)/
-INSTALL_wasm ?= wasm-install
-RUN_wasm ?= /bin/true
+CONFIGURE_wasm ?= wasm --include-path=\`pwd\`/pkg/contrib/wasmtime/crates/c-api/include --lib-path=/usr/lib/\$$(dpkg-architecture -q DEB_HOST_MULTIARCH)/ \&\& ./configure wasm-wasi-component
+INSTALL_wasm ?= wasm-install wasm-wasi-component-install
+RUN_wasm ?= /bin/true
+
define MODULE_PREBUILD_wasm
apt-get install --no-install-recommends --no-install-suggests -y libclang-dev \\\n \
\ \ \ \&\& export RUST_VERSION=1.76.0 \\\n \