From eb7ccd85f42f18b39f9ac25c20147c8e06f49bc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Mon, 23 Nov 2020 15:43:58 +0100 Subject: only link once to libc librust.a contains libc.a as well --- src/Makefile.userprog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.1