From b763ba7eccf9abbd2bc7a52050c051c4842e8f9e Mon Sep 17 00:00:00 2001 From: Andrew Clayton Date: Fri, 1 Mar 2024 03:06:14 +0000 Subject: Pretty print the wasm language module compiler output This makes use of the infrastructure introduced in a previous commit, to pretty print the make output when building the wasm language module. You can still get the old verbose output with $ make V=1 ... Reviewed-by: Alejandro Colomar Signed-off-by: Andrew Clayton --- auto/modules/wasm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'auto/modules/wasm') diff --git a/auto/modules/wasm b/auto/modules/wasm index 1f388de6..86ae7c56 100644 --- a/auto/modules/wasm +++ b/auto/modules/wasm @@ -161,8 +161,9 @@ for nxt_src in $NXT_WASM_MODULE_SRCS; do cat << END >> $NXT_MAKEFILE $NXT_BUILD_DIR/$nxt_obj: $nxt_src $NXT_VERSION_H - mkdir -p $NXT_BUILD_DIR/src/wasm - \$(CC) -c \$(CFLAGS) $NXT_WASM_ADDITIONAL_FLAGS \$(NXT_INCS) \\ + \$(v)mkdir -p $NXT_BUILD_DIR/src/wasm + \$(PP_CC) \$@ + \$(v)\$(CC) -c \$(CFLAGS) $NXT_WASM_ADDITIONAL_FLAGS \$(NXT_INCS) \\ -I$NXT_WASM_INCLUDE_PATH \\ $nxt_dep_flags \\ -o $NXT_BUILD_DIR/$nxt_obj $nxt_src @@ -186,7 +187,8 @@ all: ${NXT_WASM_MODULE} ${NXT_WASM_MODULE}: $NXT_BUILD_DIR/lib/unit/modules/${NXT_WASM_MODULE}.unit.so $NXT_BUILD_DIR/lib/unit/modules/${NXT_WASM_MODULE}.unit.so: $nxt_objs - \$(NXT_MODULE_LINK) -o \$@ \\ + \$(PP_LD) \$@ + \$(v)\$(NXT_MODULE_LINK) -o \$@ \\ $nxt_objs -L${NXT_WASM_LIB_PATH} ${NXT_WASM_LDFLAGS} $NXT_LD_OPT -- cgit From 5b01bd652a8ec4854535a9bc70b64fe7db625b51 Mon Sep 17 00:00:00 2001 From: Andrew Clayton Date: Tue, 30 Apr 2024 00:02:55 +0100 Subject: auto/wasm: No need to explicitly set -fno-strict-aliasing now Since commit 0b5223e1c ("Disable strict-aliasing in clang by default") we explicitly always build with -fno-strict-aliasing so there's no need to set it independently in auto/modules/wasm Signed-off-by: Andrew Clayton --- auto/modules/wasm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'auto/modules/wasm') diff --git a/auto/modules/wasm b/auto/modules/wasm index 86ae7c56..ad672a1e 100644 --- a/auto/modules/wasm +++ b/auto/modules/wasm @@ -63,8 +63,7 @@ NXT_WASM_LDFLAGS= if [ "$NXT_WASM_RUNTIME" = "wasmtime" ]; then NXT_WASM_LDFLAGS=-lwasmtime fi -NXT_WASM_ADDITIONAL_FLAGS="-fno-strict-aliasing \ - -Wno-missing-field-initializers \ +NXT_WASM_ADDITIONAL_FLAGS="-Wno-missing-field-initializers \ -DNXT_HAVE_WASM_$(echo ${NXT_WASM_RUNTIME} | tr 'a-z' 'A-Z') \ " -- cgit