From eac2fbdc4ba9116693f838d82edb844cccce8dd9 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 2 Jan 2023 14:15:02 -0500 Subject: sim: common: move libcommon.a objects to sources This simplifies the build logic and avoids an Automake bug where the common_libcommon_a_OBJECTS variable isn't set in the arch libsim.a DEPENDENCIES for targets that, alphabetically, come before "common". We aren't affected by that bug with the current code, but as we move things out of SIM_ALL_RECURSIVE_DEPS and rely on finer dependencies, we will trip over it. --- sim/bpf/local.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sim/bpf') diff --git a/sim/bpf/local.mk b/sim/bpf/local.mk index 5f559c9..4218999 100644 --- a/sim/bpf/local.mk +++ b/sim/bpf/local.mk @@ -23,9 +23,9 @@ AM_CPPFLAGS_%C%_decode_be.o = -DWANT_ISA_EBPFBE AM_CPPFLAGS_%C%_sem_le.o = -DWANT_ISA_EBPFLE AM_CPPFLAGS_%C%_sem_be.o = -DWANT_ISA_EBPFBE -%C%_libsim_a_SOURCES = +%C%_libsim_a_SOURCES = \ + $(common_libcommon_a_SOURCES) %C%_libsim_a_LIBADD = \ - $(common_libcommon_a_OBJECTS) \ $(patsubst %,%D%/%,$(SIM_NEW_COMMON_OBJS)) \ $(patsubst %,%D%/dv-%.o,$(SIM_HW_DEVICES)) \ %D%/modules.o \ -- cgit v1.1