diff options
| author | Gustav Sörnäs <gustav@sornas.net> | 2020-11-23 15:43:58 +0100 |
|---|---|---|
| committer | Gustav Sörnäs <gustav@sornas.net> | 2020-11-23 15:43:58 +0100 |
| commit | eb7ccd85f42f18b39f9ac25c20147c8e06f49bc9 (patch) | |
| tree | 4e5cea5152fa59ce30f2c17688c5dccc6a5d0e61 | |
| parent | 0a399b1135a9af3b488953b934b25687ab87018d (diff) | |
| download | pintos-rs-eb7ccd85f42f18b39f9ac25c20147c8e06f49bc9.tar.gz | |
only link once to libc
librust.a contains libc.a as well
| -rw-r--r-- | src/Makefile.userprog | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Makefile.userprog b/src/Makefile.userprog index 9700775..c9ad8ee 100644 --- a/src/Makefile.userprog +++ b/src/Makefile.userprog @@ -24,7 +24,7 @@ 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 -LIB_RUST = $(LIB) librust.a +LIB_RUST = lib/user/entry.o librust.a LIBDIR_RUST = $(SRCDIR)/../rust |