From: Mike Frysinger <vapier@gentoo.org>
To: gdb-patches@sourceware.org
Subject: [PATCH] sim: split CPPFLAGS between build & host
Date: Mon, 31 Oct 2022 22:17:16 +0545 [thread overview]
Message-ID: <20221031163217.27452-1-vapier@gentoo.org> (raw)
In order to merge more common/ files into the top-level, we need to
add more host flags to CPPFLAGS, and that conflicts with our current
use with build-time tools. So split them apart like we do with all
other build flags to avoid the issue.
---
sim/Makefile.am | 5 ++++-
sim/Makefile.in | 5 ++++-
sim/arch-subdir.mk.in | 1 +
sim/common/local.mk | 1 +
sim/configure | 8 ++++++--
sim/m4/sim_ac_toolchain.m4 | 3 +++
6 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/sim/Makefile.am b/sim/Makefile.am
index 79537e779b3a..594c91ff19bd 100644
--- a/sim/Makefile.am
+++ b/sim/Makefile.am
@@ -42,7 +42,10 @@ AM_CPPFLAGS = \
-I$(srcroot)/include \
$(SIM_INLINE)
-COMPILE_FOR_BUILD = $(CC_FOR_BUILD) $(AM_CPPFLAGS) $(CFLAGS_FOR_BUILD)
+AM_CPPFLAGS_FOR_BUILD = \
+ -I$(srcroot)/include \
+ $(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 $@
## Deps to add to the all-recursive target. These are built before descending
diff --git a/sim/arch-subdir.mk.in b/sim/arch-subdir.mk.in
index 69a8e2f1e551..2c0e2bbce93d 100644
--- a/sim/arch-subdir.mk.in
+++ b/sim/arch-subdir.mk.in
@@ -32,6 +32,7 @@ CC = @CC@
C_DIALECT = @C_DIALECT@
CC_FOR_BUILD = @CC_FOR_BUILD@
CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
CFLAGS = @CFLAGS@
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
diff --git a/sim/common/local.mk b/sim/common/local.mk
index 377ebe647308..65a375f349f7 100644
--- a/sim/common/local.mk
+++ b/sim/common/local.mk
@@ -19,6 +19,7 @@
## Most still lives in common/Make-common.in.
AM_CPPFLAGS += -I$(srcdir)/%D%
+AM_CPPFLAGS_FOR_BUILD += -I$(srcdir)/%D%
## This makes sure common parts are available before building the arch-subdirs
## which will refer to these.
diff --git a/sim/m4/sim_ac_toolchain.m4 b/sim/m4/sim_ac_toolchain.m4
index 74532142929c..f3bcf463656e 100644
--- a/sim/m4/sim_ac_toolchain.m4
+++ b/sim/m4/sim_ac_toolchain.m4
@@ -32,18 +32,21 @@ if test "x$cross_compiling" = "xno"; then
: "${CC_FOR_BUILD:=\$(CC)}"
: "${RANLIB_FOR_BUILD:=\$(RANLIB)}"
: "${CFLAGS_FOR_BUILD:=\$(CFLAGS)}"
+ : "${CPPFLAGS_FOR_BUILD:=\$(CPPFLAGS)}"
: "${LDFLAGS_FOR_BUILD:=\$(LDFLAGS)}"
else
: "${AR_FOR_BUILD:=ar}"
: "${CC_FOR_BUILD:=gcc}"
: "${RANLIB_FOR_BUILD:=ranlib}"
: "${CFLAGS_FOR_BUILD:=-g -O}"
+ : "${CPPFLAGS_FOR_BUILD:=}"
: "${LDLFAGS_FOR_BUILD:=}"
fi
AC_SUBST(AR_FOR_BUILD)
AC_SUBST(CC_FOR_BUILD)
AC_SUBST(RANLIB_FOR_BUILD)
AC_SUBST(CFLAGS_FOR_BUILD)
+AC_SUBST(CPPFLAGS_FOR_BUILD)
AC_SUBST(LDFLAGS_FOR_BUILD)
AC_SUBST(CFLAGS)
--
2.37.3
reply other threads:[~2022-10-31 17:46 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221031163217.27452-1-vapier@gentoo.org \
--to=vapier@gentoo.org \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).