From 10737236a0fd768ba207d23f451505c85a35d60e Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Thu, 15 Apr 2021 16:03:15 -0700 Subject: [PATCH] sim: Add SIM_EXTRA_CFLAGS after CSEARCH. The bfin sim adds include paths for the SDL libraries. These include paths might include headers for different version of binutils. Move SIM_EXTRA_CFLAGS after CSEARCH to ensure local includes are always preferred to external includes. sim/common/ChangeLog: * Make-common.in (CONFIG_CFLAGS): Remove SIM_EXTRA_CFLAGS. (ALL_CLAGS, COMMON_DEP_CFLAGS): Add SIM_EXTRA_CFLAGS after CSEARCH. --- sim/common/ChangeLog | 6 ++++++ sim/common/Make-common.in | 7 +++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index dd4391e36d9..c8782d7c34b 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,9 @@ +2021-04-15 John Baldwin + + * Make-common.in (CONFIG_CFLAGS): Remove SIM_EXTRA_CFLAGS. + (ALL_CLAGS, COMMON_DEP_CFLAGS): Add SIM_EXTRA_CFLAGS after + CSEARCH. + 2021-04-12 Mike Frysinger * sim-cpu.c (sim_cpu_alloc_all): Delete 3rd arg. Delete 2nd arg to diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index 28f50abb220..709882469e4 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -227,17 +227,16 @@ CONFIG_CFLAGS = \ $(SIM_SCACHE) \ $(SIM_WARN_CFLAGS) \ $(SIM_WERROR_CFLAGS) \ - $(SIM_HARDWARE) \ - $(SIM_EXTRA_CFLAGS) + $(SIM_HARDWARE) CSEARCH = -I. -I$(srcdir) -I../common -I$(srccom) \ -I../../include -I$(srcroot)/include \ -I../../bfd -I$(srcroot)/bfd \ -I../../opcodes -I$(srcroot)/opcodes \ @INCINTL@ -ALL_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH) $(CFLAGS) +ALL_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH) $(SIM_EXTRA_CFLAGS) $(CFLAGS) BUILD_CFLAGS = $(CFLAGS_FOR_BUILD) $(CSEARCH) -COMMON_DEP_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH) +COMMON_DEP_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH) $(SIM_EXTRA_CFLAGS) ZLIB = @zlibdir@ -lz LIBIBERTY_LIB = ../../libiberty/libiberty.a -- 2.30.2