diff options
| author | Gustav Sörnäs <gustav@sornas.net> | 2020-11-24 15:08:20 +0100 |
|---|---|---|
| committer | Gustav Sörnäs <gustav@sornas.net> | 2020-11-24 15:08:20 +0100 |
| commit | eba74d74502641a4565dc6011db33742e8450680 (patch) | |
| tree | f7785882d1084944b309bd777d4663112823070a /src/Makefile.build | |
| parent | 0960f519d9e1e3c108b1825a0ec241b1c56c5cca (diff) | |
| download | pintos-rs-eba74d74502641a4565dc6011db33742e8450680.tar.gz | |
move rust "libc" to separate crate and link with that instead
Diffstat (limited to 'src/Makefile.build')
| -rw-r--r-- | src/Makefile.build | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.build b/src/Makefile.build index a9e5a23..1f0fa35 100644 --- a/src/Makefile.build +++ b/src/Makefile.build @@ -83,7 +83,7 @@ LIBDIR_RUST = $(SRCDIR)/../kernel LIB_RUST = libkernel-rs.a $(LIB_RUST): - make -C $(LIBDIR_RUST) debug + (cd $(LIBDIR_RUST) && cargo build) cp $(LIBDIR_RUST)/target/debug/libkernel.a $@ .PHONY: $(LIB_RUST) @@ -106,7 +106,7 @@ os.dsk: loader.bin kernel.bin cat $^ > $@ clean:: - make -C $(LIBDIR_RUST) clean + (cd $(LIBDIR_RUST) && cargo clean) rm -f $(OBJECTS) $(DEPENDS) rm -f threads/loader.o threads/kernel.lds.s threads/loader.d rm -f kernel.o kernel.lds.s |