[v2,2/4] {gdb, gdbserver}/Makefile.in: remove unnecessary intermediary variables
Checks
Context |
Check |
Description |
linaro-tcwg-bot/tcwg_gdb_build--master-aarch64 |
success
|
Testing passed
|
linaro-tcwg-bot/tcwg_gdb_build--master-arm |
success
|
Testing passed
|
linaro-tcwg-bot/tcwg_gdb_check--master-arm |
success
|
Testing passed
|
linaro-tcwg-bot/tcwg_gdb_check--master-aarch64 |
success
|
Testing passed
|
Commit Message
Remove `INTERNAL_CFLAGS_BASE` and `INTERNAL_WARN_CFLAGS`, inline their
contents in `INTERNAL_CFLAGS`. Not functional changes expected.
Change-Id: I6a09794835ca2cfd4a88a3e9f2e627c8f5bd569f
---
gdb/Makefile.in | 8 ++++----
gdbserver/Makefile.in | 12 +++---------
2 files changed, 7 insertions(+), 13 deletions(-)
@@ -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.
@@ -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