diff options
| author | Joel Brobecker <brobecker@adacore.com> | 2014-09-16 11:55:01 -0700 |
|---|---|---|
| committer | Joel Brobecker <brobecker@adacore.com> | 2014-09-16 13:31:07 -0700 |
| commit | bffc0964c7730dcdcc81eb5d45ee69b1e2a2cbec (patch) | |
| tree | 99e434d60df6da2710c84465ab5204497dd8733d /gdb | |
| parent | 76aeec5b98e73589013f24bd99e3c40189bec7e8 (diff) | |
| download | gdb-bffc0964c7730dcdcc81eb5d45ee69b1e2a2cbec.zip gdb-bffc0964c7730dcdcc81eb5d45ee69b1e2a2cbec.tar.gz gdb-bffc0964c7730dcdcc81eb5d45ee69b1e2a2cbec.tar.bz2 | |
Fix CPPFLAGS handling in gdbserver's build.
In gdb/gdbserver/Makefile.in, IPAGENT_CFLAGS is defined using
an expression which references $(CPPFLAGS). But CPPFLAGS isn't
actually defined.
This patch first adds a CPPFLAGS definition, so as to inherit
the value passed at configure time (if any). And it then makes it
part of INTERNAL_CFLAGS_BASE, instead. There is no reason that
CPPFLAGS be useful for a certain class of source files, and not
the rest. This is also consistent with what's done in GDB.
gdb/gdbserver/ChangeLog:
* Makefile.in (CPPFLAGS): Define.
(INTERNAL_CFLAGS_BASE): Add ${CPPFLAGS}.
(IPAGENT_CFLAGS): Remove ${CPPFLAGS}.
Tested by rebuilding GDBserver with a dummy CPPFLAGS, and verifying
that the compilation command was altered as expected.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/gdbserver/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/gdbserver/Makefile.in | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index f244123..ec32f71 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,9 @@ +2014-09-16 Joel Brobecker <brobecker@adacore.com> + + * Makefile.in (CPPFLAGS): Define. + (INTERNAL_CFLAGS_BASE): Add ${CPPFLAGS}. + (IPAGENT_CFLAGS): Remove ${CPPFLAGS}. + 2014-09-16 Gary Benson <gbenson@redhat.com> * inferiors.h (current_inferior): Renamed as... diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in index 074d93d..e9d6b15 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in @@ -128,10 +128,11 @@ WARN_CFLAGS_NO_FORMAT = `echo " $(WARN_CFLAGS) " \ # CFLAGS is specifically reserved for setting from the command line # when running make. I.E. "make CFLAGS=-Wmissing-prototypes". CFLAGS = @CFLAGS@ +CPPFLAGS = @CPPFLAGS@ # INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros. INTERNAL_CFLAGS_BASE = ${CFLAGS} ${GLOBAL_CFLAGS} \ - ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} + ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CPPFLAGS} INTERNAL_WARN_CFLAGS = ${INTERNAL_CFLAGS_BASE} $(WARN_CFLAGS) INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) -DGDBSERVER @@ -447,7 +448,7 @@ UST_CFLAGS = $(ustinc) -DCONFIG_UST_GDB_INTEGRATION # Note, we only build the IPA if -fvisibility=hidden is supported in # the first place. -IPAGENT_CFLAGS = $(CPPFLAGS) $(INTERNAL_CFLAGS) $(UST_CFLAGS) \ +IPAGENT_CFLAGS = $(INTERNAL_CFLAGS) $(UST_CFLAGS) \ -fPIC -DIN_PROCESS_AGENT \ -fvisibility=hidden |