diff options
Diffstat (limited to 'meta/recipes-devtools/gdb/gdb/gdbserver-cflags-last.diff')
-rw-r--r-- | meta/recipes-devtools/gdb/gdb/gdbserver-cflags-last.diff | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/meta/recipes-devtools/gdb/gdb/gdbserver-cflags-last.diff b/meta/recipes-devtools/gdb/gdb/gdbserver-cflags-last.diff index 4dfc419c43..16a3aa93d9 100644 --- a/meta/recipes-devtools/gdb/gdb/gdbserver-cflags-last.diff +++ b/meta/recipes-devtools/gdb/gdb/gdbserver-cflags-last.diff | |||
@@ -4,22 +4,20 @@ Upstream-Status: Pending | |||
4 | gdb/gdbserver/Makefile.in | 4 ++-- | 4 | gdb/gdbserver/Makefile.in | 4 ++-- |
5 | 1 file changed, 2 insertions(+), 2 deletions(-) | 5 | 1 file changed, 2 insertions(+), 2 deletions(-) |
6 | 6 | ||
7 | Index: gdb/gdbserver/Makefile.in | ||
8 | =================================================================== | ||
7 | --- gdb/gdbserver/Makefile.in.orig | 9 | --- gdb/gdbserver/Makefile.in.orig |
8 | +++ gdb/gdbserver/Makefile.in | 10 | +++ gdb/gdbserver/Makefile.in |
9 | @@ -118,14 +118,14 @@ WARN_CFLAGS_NO_FORMAT = `echo " $(WARN_C | 11 | @@ -131,10 +131,10 @@ CFLAGS = @CFLAGS@ |
10 | # CFLAGS is specifically reserved for setting from the command line | 12 | CPPFLAGS = @CPPFLAGS@ |
11 | # when running make. I.E. "make CFLAGS=-Wmissing-prototypes". | ||
12 | CFLAGS = @CFLAGS@ | ||
13 | 13 | ||
14 | # INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros. | 14 | # INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros. |
15 | -INTERNAL_CFLAGS_BASE = ${CFLAGS} ${GLOBAL_CFLAGS} \ | 15 | -INTERNAL_CFLAGS_BASE = ${CFLAGS} ${GLOBAL_CFLAGS} \ |
16 | +INTERNAL_CFLAGS_BASE = ${GLOBAL_CFLAGS} \ | 16 | +INTERNAL_CFLAGS_BASE = ${GLOBAL_CFLAGS} \ |
17 | ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} | 17 | ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CPPFLAGS} |
18 | INTERNAL_WARN_CFLAGS = ${INTERNAL_CFLAGS_BASE} $(WARN_CFLAGS) | 18 | INTERNAL_WARN_CFLAGS = ${INTERNAL_CFLAGS_BASE} $(WARN_CFLAGS) |
19 | -INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) -DGDBSERVER | 19 | -INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) -DGDBSERVER |
20 | +INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) ${CFLAGS} -DGDBSERVER | 20 | +INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) ${CFLAGS} -DGDBSERVER |
21 | 21 | ||
22 | # LDFLAGS is specifically reserved for setting from the command line | 22 | # LDFLAGS is specifically reserved for setting from the command line |
23 | # when running make. | 23 | # when running make. |
24 | LDFLAGS = @LDFLAGS@ | ||
25 | INTERNAL_LDFLAGS = $(LDFLAGS) @RDYNAMIC@ | ||