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

This matches what we do with targets already.
This commit is contained in:
Mike Frysinger
2022-11-05 10:33:37 +07:00
parent fc9c0bdce0
commit bfc96c1039
2 changed files with 6 additions and 3 deletions

View File

@ -46,10 +46,12 @@ AM_CPPFLAGS = \
-I$(srcroot)/include \ -I$(srcroot)/include \
-I../bfd \ -I../bfd \
-I.. \ -I.. \
$(SIM_HW_CFLAGS) \
$(SIM_INLINE) $(SIM_INLINE)
AM_CPPFLAGS_FOR_BUILD = \ AM_CPPFLAGS_FOR_BUILD = \
-I$(srcroot)/include \ -I$(srcroot)/include \
$(SIM_HW_CFLAGS) \
$(SIM_INLINE) $(SIM_INLINE)
COMPILE_FOR_BUILD = $(CC_FOR_BUILD) $(AM_CPPFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) 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 $@ LINK_FOR_BUILD = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@

View File

@ -924,9 +924,10 @@ MOSTLYCLEANFILES = core $(am__append_5) site-sim-config.exp \
$(am__append_34) $(am__append_37) $(am__append_39) $(am__append_34) $(am__append_37) $(am__append_39)
AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS) AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS)
AM_CPPFLAGS = $(INCGNU) -I$(srcroot)/include -I../bfd -I.. \ AM_CPPFLAGS = $(INCGNU) -I$(srcroot)/include -I../bfd -I.. \
$(SIM_INLINE) -I$(srcdir)/common -DSIM_COMMON_BUILD $(SIM_HW_CFLAGS) $(SIM_INLINE) -I$(srcdir)/common \
AM_CPPFLAGS_FOR_BUILD = -I$(srcroot)/include $(SIM_INLINE) \ -DSIM_COMMON_BUILD
-I$(srcdir)/common 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) 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 $@ LINK_FOR_BUILD = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@
SIM_ALL_RECURSIVE_DEPS = common/libcommon.a $(am__append_2) \ SIM_ALL_RECURSIVE_DEPS = common/libcommon.a $(am__append_2) \