aboutsummaryrefslogtreecommitdiff
path: root/sim/common
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2021-06-19 00:52:10 -0400
committerMike Frysinger <vapier@gentoo.org>2021-06-19 16:18:07 -0400
commitce3ec98acd2f344ae911de3f41dd2e3c6c68b141 (patch)
treefa9a1ef1190111696b857178593ee7a1b777c65a /sim/common
parentbc56166f66244a9e3abc62c7bc595a6f800f23b0 (diff)
downloadfsf-binutils-gdb-ce3ec98acd2f344ae911de3f41dd2e3c6c68b141.zip
fsf-binutils-gdb-ce3ec98acd2f344ae911de3f41dd2e3c6c68b141.tar.gz
fsf-binutils-gdb-ce3ec98acd2f344ae911de3f41dd2e3c6c68b141.tar.bz2
sim: unify gettext/intl probing logic
Move these options up to the common dir so we only test & export them once across all ports.
Diffstat (limited to 'sim/common')
-rw-r--r--sim/common/ChangeLog5
-rw-r--r--sim/common/Make-common.in4
2 files changed, 6 insertions, 3 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 5586bc8..4398b89 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,5 +1,10 @@
2021-06-19 Mike Frysinger <vapier@gentoo.org>
+ * Make-common.in (CSEARCH): Change @INCINTL@ to $(INTL_CFLAGS).
+ (LIBINTL, LIBINTL_DEP): Delete.
+
+2021-06-19 Mike Frysinger <vapier@gentoo.org>
+
* Make-common.in: Move dependency vars to ../arch-subdir.mk.in.
2021-06-19 Mike Frysinger <vapier@gentoo.org>
diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index 4b430b8..80e45c7 100644
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -211,7 +211,7 @@ CSEARCH = -I. -I$(srcdir) -I../common -I$(srccom) \
-I../../bfd -I$(srcroot)/bfd \
-I../../opcodes -I$(srcroot)/opcodes \
-I../.. \
- @INCINTL@
+ $(INTL_CFLAGS)
ALL_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH) $(INCGNU) $(SIM_EXTRA_CFLAGS) $(CFLAGS)
BUILD_CFLAGS = $(CFLAGS_FOR_BUILD) $(CSEARCH)
@@ -221,8 +221,6 @@ ZLIB = $(zlibdir) -lz
LIBIBERTY_LIB = ../../libiberty/libiberty.a
BFD_LIB = ../../bfd/libbfd.a
OPCODES_LIB = ../../opcodes/libopcodes.a
-LIBINTL = @LIBINTL@
-LIBINTL_DEP = @LIBINTL_DEP@
CONFIG_LIBS = $(COMMON_LIBS) @LIBS@ $(ZLIB)
LIBDEPS = $(BFD_LIB) $(OPCODES_LIB) $(LIBINTL_DEP) $(LIBIBERTY_LIB)
EXTRA_LIBS = $(BFD_LIB) $(OPCODES_LIB) $(LIBINTL) $(LIBIBERTY_LIB) \