diff options
| author | Gustav Sörnäs <gustav@sornas.net> | 2020-11-23 15:18:13 +0100 |
|---|---|---|
| committer | Gustav Sörnäs <gustav@sornas.net> | 2020-11-23 15:18:13 +0100 |
| commit | 0a399b1135a9af3b488953b934b25687ab87018d (patch) | |
| tree | 89185506eedb789334cecf6a59f6243c380673af /src/Makefile.userprog | |
| parent | 30c54113477b08c7650194a16cf7a63a7cdd142f (diff) | |
| download | pintos-rs-0a399b1135a9af3b488953b934b25687ab87018d.tar.gz | |
only link librust when needed
Diffstat (limited to 'src/Makefile.userprog')
| -rw-r--r-- | src/Makefile.userprog | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/Makefile.userprog b/src/Makefile.userprog index 165d7ed..9700775 100644 --- a/src/Makefile.userprog +++ b/src/Makefile.userprog @@ -23,7 +23,8 @@ lib/user_SRC += lib/user/console.c # Console code. LIB_OBJ = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$(lib_SRC) $(lib/user_SRC))) LIB_DEP = $(patsubst %.o,%.d,$(LIB_OBJ)) -LIB = lib/user/entry.o libc.a librust.a +LIB = lib/user/entry.o libc.a +LIB_RUST = $(LIB) librust.a LIBDIR_RUST = $(SRCDIR)/../rust @@ -39,11 +40,12 @@ lib/user/syscall.o: CPPFLAGS += -fno-omit-frame-pointer define TEMPLATE $(1)_OBJ = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$($(1)_SRC))) -$(1): $$($(1)_OBJ) $$(LIB) $$(LDSCRIPT) - $$(CC) $$(LDFLAGS) $$($(1)_OBJ) $$(LIB) -o $$@ +$(1): $$($(1)_OBJ) $(2) $$(LDSCRIPT) + $$(CC) $$(LDFLAGS) $$($(1)_OBJ) $(2) -o $$@ endef -$(foreach prog,$(PROGS),$(eval $(call TEMPLATE,$(prog)))) +$(foreach prog,$(PROGS),$(eval $(call TEMPLATE,$(prog),$(LIB)))) +$(foreach prog,$(PROGS_RUST),$(eval $(call TEMPLATE,$(prog),$(LIB_RUST)))) libc.a: $(LIB_OBJ) rm -f $@ |