Skip to content

RTS makefile: Track .rs files in subdirectories #2594

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mergify merged 3 commits into from
Jun 14, 2021
Merged

RTS makefile: Track .rs files in subdirectories #2594

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
928415d
RTS makefile: Track .rs files in subdirectories
osa1 Jun 14, 2021
2d45560
Update rts/Makefile
nomeata Jun 14, 2021
169ceff
Merge branch 'master' into osa1/rts_makefile_rs_tracking
mergify[bot] Jun 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions rts/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,10 @@ $(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

# 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

$(TOMMATH_BINDINGS_RS): | _build
bindgen $(TOMMATHSRC)/tommath.h \
Expand Down Expand Up @@ -200,11 +201,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 $@

Expand Down