aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/Makefile.in8
-rw-r--r--gdbserver/Makefile.in12
2 files changed, 7 insertions, 13 deletions
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index bf57a9a..a5139ea 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -631,7 +631,7 @@ INTERNAL_CPPFLAGS = $(CPPFLAGS) @GUILE_CPPFLAGS@ @PYTHON_CPPFLAGS@ \
@LARGEFILE_CPPFLAGS@
# INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros.
-INTERNAL_CFLAGS_BASE = \
+INTERNAL_CFLAGS = \
$(GLOBAL_CFLAGS) \
$(PROFILE_CFLAGS) \
$(GDB_CFLAGS) \
@@ -653,9 +653,9 @@ INTERNAL_CFLAGS_BASE = \
$(PTHREAD_CFLAGS) \
$(DEBUGINFOD_CFLAGS) \
$(GMPINC) \
- $(AMD_DBGAPI_CFLAGS)
-INTERNAL_WARN_CFLAGS = $(INTERNAL_CFLAGS_BASE) $(GDB_WARN_CFLAGS)
-INTERNAL_CFLAGS = $(INTERNAL_WARN_CFLAGS) $(GDB_WERROR_CFLAGS)
+ $(AMD_DBGAPI_CFLAGS) \
+ $(GDB_WARN_CFLAGS) \
+ $(GDB_WERROR_CFLAGS)
# LDFLAGS is specifically reserved for setting from the command line
# when running make.
diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in
index 3aa7aa7..45073ab 100644
--- a/gdbserver/Makefile.in
+++ b/gdbserver/Makefile.in
@@ -163,19 +163,13 @@ WIN32APILIBS = @WIN32APILIBS@
MAYBE_LIBICONV = @MAYBE_LIBICONV@
# INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros.
-INTERNAL_CFLAGS_BASE = \
+INTERNAL_CFLAGS = \
${GLOBAL_CFLAGS} \
${PROFILE_CFLAGS} \
${INCLUDE_CFLAGS} \
${CPPFLAGS} \
- $(PTHREAD_CFLAGS)
-
-INTERNAL_WARN_CFLAGS = \
- ${INTERNAL_CFLAGS_BASE} \
- $(WARN_CFLAGS)
-
-INTERNAL_CFLAGS = \
- ${INTERNAL_WARN_CFLAGS} \
+ $(PTHREAD_CFLAGS) \
+ $(WARN_CFLAGS) \
$(WERROR_CFLAGS) \
-DGDBSERVER