make the Makefiles a bit more robust

- Escape "." character in `sed` regex - Ensure that %.wasm target fails cleanly (i.e. without generating the target file) if `wasm-tools` fails Signed-off-by: Joel Dice <[email protected]>
dicej · Feb 12, 2024 · a5065e6 · a5065e6
1 parent cc62fa8
commit a5065e6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -886,7 +886,7 @@ bindings: $(BINDING_WORK_DIR)/wasi-cli $(BINDING_WORK_DIR)/wit-bindgen
 			./wasi-cli/wit && \
 		mv preview2.h ../../libc-bottom-half/headers/public/wasi/ && \
 		mv preview2_component_type.o ../../libc-bottom-half/sources && \
-		sed 's_#include "preview2.h"_#include "wasi/preview2.h"_' \
+		sed 's_#include "preview2\.h"_#include "wasi/preview2.h"_' \
 			< preview2.c \
 			> ../../libc-bottom-half/sources/preview2.c && \
 		rm preview2.c

diff --git a/test/Makefile b/test/Makefile
@@ -151,9 +151,12 @@ build: download $(WASMS)
 
 $(WASMS): | $(OBJDIRS)
 $(OBJDIR)/%.wasm: $(OBJDIR)/%.wasm.o $(INFRA_WASM_OBJS)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+	$(CC) $(CFLAGS) $(LDFLAGS) -o tmp.wasm $^
 ifeq ($(TARGET_TRIPLE), wasm32-wasi-preview2)
-	$(WASM_TOOLS) component new --adapt $(ADAPTER) $@ -o $@
+	$(WASM_TOOLS) component new --adapt $(ADAPTER) tmp.wasm -o $@
+	rm tmp.wasm
+else
+	mv tmp.wasm $@
 endif
 
 $(WASM_OBJS): $(LIBC_TEST)/src/common/test.h | $(OBJDIRS)