From c8d4ff8a3a38038942299acea0d6b2d4ba1bc9b9 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 6 Jul 2021 23:50:06 -0400 Subject: [PATCH] sim: erc32: use libsim.a for common objects We're starting to move more objects to the common build that sis did not need before, so linking them is causing problems (when common objects end up needing symbols from non-common objects). Switch it to the libsim.a archive which will allow the link to pull out only what it needs. --- sim/erc32/Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sim/erc32/Makefile.in b/sim/erc32/Makefile.in index 9ca0e3519a2..4196e25f717 100644 --- a/sim/erc32/Makefile.in +++ b/sim/erc32/Makefile.in @@ -41,9 +41,9 @@ SIM_WERROR_CFLAGS = SIS_OFILES = exec.o erc32.o func.o help.o float.o all: sis$(EXEEXT) -sis$(EXEEXT): sis.o $(SIS_OFILES) $(COMMON_OBJS) $(LIBDEPS) +sis$(EXEEXT): sis.o $(SIS_OFILES) libsim.a $(LIBDEPS) $(CC) $(ALL_CFLAGS) -o sis$(EXEEXT) \ - sis.o $(SIS_OFILES) $(COMMON_OBJS) $(EXTRA_LIBS) + sis.o $(SIS_OFILES) libsim.a $(EXTRA_LIBS) # Copy the files into directories where they will be run. install-sis: installdirs -- 2.30.2