Libraries that override CPPFLAGS (like lib32_libmsvcrt_a_CPPFLAGS)
don't get AM_CPPFLAGS included automatically. We shouldn't add it
to the CPPFLAGS32 variable that gets used there, because then it
would get added twice for the object files that use the explicit
COMPILE macro (which already includes AM_CPPFLAGS).

This makes sure that the source files are built consistently
as intended.

Signed-off-by: Martin Storsjö <mar...@martin.st>
---
 mingw-w64-crt/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index cf79851..2774d3e 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -19,8 +19,8 @@ else
   withsys=
 endif
 
-AM_CPPFLAGS=-D_CRTBLD $(sysincludes)
-AM_CFLAGS=-pipe -std=gnu99 -D_WIN32_WINNT=0x0f00 -D__MSVCRT_VERSION__=0x700 
@ADD_C_CXX_WARNING_FLAGS@ @ADD_C_ONLY_WARNING_FLAGS@
+AM_CPPFLAGS=$(sysincludes)
+AM_CFLAGS=-pipe -std=gnu99 -D_WIN32_WINNT=0x0f00 -D__MSVCRT_VERSION__=0x700 
@ADD_C_CXX_WARNING_FLAGS@ @ADD_C_ONLY_WARNING_FLAGS@ -D_CRTBLD
 AM_CXXFLAGS=@ADD_C_CXX_WARNING_FLAGS@ @ADD_CXX_ONLY_WARNING_FLAGS@
 CPPFLAGSARM32=-mfpu=vfp
 CPPFLAGS32=-m32
-- 
2.7.4


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public

Reply via email to