sim: build: add SIM_HW_CFLAGS to top-level build too

This matches what we do with targets already.

diff --git a/sim/Makefile.am b/sim/Makefile.am
index d8730f276988a53adce33be44d75d4b95e90b23b..7ea013ac1965e8d34542eb65bc11b77ca1b993b4 100644 (file)
--- a/sim/Makefile.am
+++ b/sim/Makefile.am
@@ -46,10 +46,12 @@ AM_CPPFLAGS = \
        -I$(srcroot)/include \
        -I../bfd \
        -I.. \
+       $(SIM_HW_CFLAGS) \
        $(SIM_INLINE)
 
 AM_CPPFLAGS_FOR_BUILD = \
        -I$(srcroot)/include \
+       $(SIM_HW_CFLAGS) \
        $(SIM_INLINE)
 COMPILE_FOR_BUILD = $(CC_FOR_BUILD) $(AM_CPPFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD)
 LINK_FOR_BUILD = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@

diff --git a/sim/Makefile.in b/sim/Makefile.in
index 57c1fc034a0b9536df3666f6733e4d0bd7dd382d..06d5da1ecf5b0d592cefc51553a84ce687f33cf5 100644 (file)
--- a/sim/Makefile.in
+++ b/sim/Makefile.in
@@ -924,9 +924,10 @@ MOSTLYCLEANFILES = core $(am__append_5) site-sim-config.exp \
        $(am__append_34) $(am__append_37) $(am__append_39)
 AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS)
 AM_CPPFLAGS = $(INCGNU) -I$(srcroot)/include -I../bfd -I.. \
-       $(SIM_INLINE) -I$(srcdir)/common -DSIM_COMMON_BUILD
-AM_CPPFLAGS_FOR_BUILD = -I$(srcroot)/include $(SIM_INLINE) \
-       -I$(srcdir)/common
+       $(SIM_HW_CFLAGS) $(SIM_INLINE) -I$(srcdir)/common \
+       -DSIM_COMMON_BUILD
+AM_CPPFLAGS_FOR_BUILD = -I$(srcroot)/include $(SIM_HW_CFLAGS) \
+       $(SIM_INLINE) -I$(srcdir)/common
 COMPILE_FOR_BUILD = $(CC_FOR_BUILD) $(AM_CPPFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD)
 LINK_FOR_BUILD = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@
 SIM_ALL_RECURSIVE_DEPS = common/libcommon.a $(am__append_2) \