diff options
author | Andreas Fritiofson <andreas.fritiofson@gmail.com> | 2016-12-27 01:47:23 +0100 |
---|---|---|
committer | Paul Fertser <fercerpav@gmail.com> | 2017-01-15 10:16:16 +0000 |
commit | 7436f7c2c0318fabce777d8886b302e3ca128606 (patch) | |
tree | b8173074631e47abc0d221e2c97d21bf0b288aba | |
parent | 7851207cf0d03428904a80f64db295268919ce86 (diff) |
helper,rtos,server: Restore missing warning flags
These libraries override the used CFLAGS without adding the
defaults. This didn't have any effect until change
http://openocd.zylin.com/3870 (ef4c139). Restore by adding
AM_CLAGS to the per-target CFLAGS.
Interestingly, automake seems to clear the CFLAGS for the target
even if the override variable is only mentioned within a non-active
conditional branch, such as the IS_MINGW for the affected libraries.
Change-Id: I805206865e59e3fa33a7ea3c0d3472e51219351c
Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Reviewed-on: http://openocd.zylin.com/3927
Tested-by: jenkins
Reviewed-by: Paul Fertser <fercerpav@gmail.com>
-rw-r--r-- | src/helper/Makefile.am | 2 | ||||
-rw-r--r-- | src/rtos/Makefile.am | 2 | ||||
-rw-r--r-- | src/server/Makefile.am | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am index 36238943..e0f7f49b 100644 --- a/src/helper/Makefile.am +++ b/src/helper/Makefile.am @@ -37,7 +37,7 @@ else %C%_libhelper_la_SOURCES += %D%/ioutil_stubs.c endif -%C%_libhelper_la_CFLAGS = +%C%_libhelper_la_CFLAGS = $(AM_CFLAGS) if IS_MINGW # FD_* macros are sloppy with their signs on MinGW32 platform %C%_libhelper_la_CFLAGS += -Wno-sign-compare diff --git a/src/rtos/Makefile.am b/src/rtos/Makefile.am index aca266e1..c59ee3f8 100644 --- a/src/rtos/Makefile.am +++ b/src/rtos/Makefile.am @@ -24,7 +24,7 @@ noinst_LTLIBRARIES += %D%/librtos.la %D%/rtos_mqx_stackings.h \ %D%/rtos_ucos_iii_stackings.h -%C%_librtos_la_CFLAGS = +%C%_librtos_la_CFLAGS = $(AM_CFLAGS) if IS_MINGW # FD_* macros are sloppy with their signs on MinGW32 platform diff --git a/src/server/Makefile.am b/src/server/Makefile.am index 5970d031..804efac1 100644 --- a/src/server/Makefile.am +++ b/src/server/Makefile.am @@ -10,7 +10,7 @@ noinst_LTLIBRARIES += %D%/libserver.la %D%/tcl_server.c \ %D%/tcl_server.h -%C%_libserver_la_CFLAGS = +%C%_libserver_la_CFLAGS = $(AM_CFLAGS) if IS_MINGW # FD_* macros are sloppy with their signs on MinGW32 platform %C%_libserver_la_CFLAGS += -Wno-sign-compare |