From 928415d78fa23097f29f9330250eeca4a9b7539f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=96mer=20Sinan=20A=C4=9Facan?= Date: Mon, 14 Jun 2021 12:29:12 +0300 Subject: [PATCH 1/2] RTS makefile: Track .rs files in subdirectories --- rts/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rts/Makefile b/rts/Makefile index 1c64f5027af..562cd990bcd 100644 --- a/rts/Makefile +++ b/rts/Makefile @@ -157,9 +157,9 @@ $(MUSL_WASM_A): $(MUSL_WASM_O) RTS_RUST_WASM_A=_build/wasm/libmotoko_rts.a RTS_RUST_DEBUG_WASM_A=_build/wasm/libmotoko_rts_debug.a -TOMMATH_BINDINGS_RS=_build/tommath_bindings.rs - +RTS_RUST_FILES=$(shell ls **/*.rs) +TOMMATH_BINDINGS_RS=_build/tommath_bindings.rs $(TOMMATH_BINDINGS_RS): | _build bindgen $(TOMMATHSRC)/tommath.h \ @@ -200,11 +200,11 @@ $(TOMMATH_BINDINGS_RS): | _build # macros like `mp_get_u32` and `mp_isneg` need to be manually implemented. -$(RTS_RUST_WASM_A): $(TOMMATH_BINDINGS_RS) $(wildcard motoko-rts/src/*.rs) | _build/wasm +$(RTS_RUST_WASM_A): $(TOMMATH_BINDINGS_RS) $(RTS_RUST_FILES) | _build/wasm cd motoko-rts && xargo build --release --target=wasm32-unknown-emscripten cp motoko-rts/target/wasm32-unknown-emscripten/release/libmotoko_rts.a $@ -$(RTS_RUST_DEBUG_WASM_A): $(TOMMATH_BINDINGS_RS) $(wildcard motoko-rts/src/*.rs) | _build/wasm +$(RTS_RUST_DEBUG_WASM_A): $(TOMMATH_BINDINGS_RS) $(RTS_RUST_FILES) | _build/wasm cd motoko-rts && xargo build --target=wasm32-unknown-emscripten cp motoko-rts/target/wasm32-unknown-emscripten/debug/libmotoko_rts.a $@ From 2d4556057fc8383044af8c1ef300aef957c91374 Mon Sep 17 00:00:00 2001 From: Joachim Breitner Date: Mon, 14 Jun 2021 11:43:22 +0200 Subject: [PATCH 2/2] Update rts/Makefile --- rts/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/rts/Makefile b/rts/Makefile index 562cd990bcd..fa700b881e1 100644 --- a/rts/Makefile +++ b/rts/Makefile @@ -157,6 +157,7 @@ $(MUSL_WASM_A): $(MUSL_WASM_O) RTS_RUST_WASM_A=_build/wasm/libmotoko_rts.a RTS_RUST_DEBUG_WASM_A=_build/wasm/libmotoko_rts_debug.a +# this relies on bash and globstar, see https://stackoverflow.com/questions/2483182/recursive-wildcards-in-gnu-make RTS_RUST_FILES=$(shell ls **/*.rs) TOMMATH_BINDINGS_RS=_build/tommath_bindings.rs