diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2022-11-03 13:35:32 +0545 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2022-11-04 07:42:31 +0700 |
| commit | 89cf99a910ccfd95e478be81adc7493db138dfef (patch) | |
| tree | 7708e7adfa591aed726b8d35b11ca1aa15afb179 /sim/common | |
| parent | 90db43bb0325ce387da536f4939bfe01e80227b2 (diff) | |
| download | fsf-binutils-gdb-89cf99a910ccfd95e478be81adc7493db138dfef.zip fsf-binutils-gdb-89cf99a910ccfd95e478be81adc7493db138dfef.tar.gz fsf-binutils-gdb-89cf99a910ccfd95e478be81adc7493db138dfef.tar.bz2 | |
sim: build: switch to bfd & opcodes libtool linker scripts
Now that we use libtool to link, we don't need to duplicate all the
libs that bfd itself uses. This simplifies the configure & Makefile.
Diffstat (limited to 'sim/common')
| -rw-r--r-- | sim/common/Make-common.in | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index 83b1cf1..c58eb0d 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -210,8 +210,7 @@ CSEARCH = -I. -I$(srcdir) -I$(srccom) \ -I$(srcroot)/include \ -I../../bfd -I$(srcroot)/bfd \ -I$(srcroot)/opcodes \ - -I../.. \ - $(INTL_CFLAGS) + -I../.. ALL_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH) $(INCGNU) $(SIM_EXTRA_CFLAGS) $(CFLAGS) BUILD_CFLAGS = $(CFLAGS_FOR_BUILD) $(CSEARCH) @@ -219,14 +218,13 @@ COMMON_DEP_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH) $(SIM_EXTRA_CFLAGS) SIM_HW_DEVICES = cfi core pal glue $(SIM_EXTRA_HW_DEVICES) -ZLIB = $(zlibdir) -lz LIBIBERTY_LIB = ../../libiberty/libiberty.a -BFD_LIB = ../../bfd/libbfd.a -OPCODES_LIB = ../../opcodes/libopcodes.a -CONFIG_LIBS = $(COMMON_LIBS) @LIBS@ $(ZLIB) $(ZSTD_LIBS) -LIBDEPS = $(BFD_LIB) $(OPCODES_LIB) $(LIBINTL_DEP) $(LIBIBERTY_LIB) -EXTRA_LIBS = $(BFD_LIB) $(OPCODES_LIB) $(LIBINTL) $(LIBIBERTY_LIB) \ - $(CONFIG_LIBS) $(SIM_EXTRA_LIBS) $(LIBDL) $(LIBGNU) $(LIBGNU_EXTRA_LIBS) +BFD_LIB = ../../bfd/libbfd.la +OPCODES_LIB = ../../opcodes/libopcodes.la +CONFIG_LIBS = $(COMMON_LIBS) @LIBS@ +LIBDEPS = $(BFD_LIB) $(OPCODES_LIB) $(LIBIBERTY_LIB) +EXTRA_LIBS = $(BFD_LIB) $(OPCODES_LIB) $(LIBIBERTY_LIB) \ + $(CONFIG_LIBS) $(SIM_EXTRA_LIBS) $(LIBGNU) $(LIBGNU_EXTRA_LIBS) COMMON_OBJS_NAMES = \ callback.o \ |