From 0430182045efc84ff023b0f67095682c246dcae0 Mon Sep 17 00:00:00 2001
From: Pietro Cerutti <gahr@gahr.ch>
Date: Wed, 25 Oct 2017 16:51:46 +0100
Subject: [PATCH] Do not use CPPFLAGS / CFLAGS together with CC_FOR_BUILD
 (#882)

* Do not use CPPFLAGS / CFLAGS together with CC_FOR_BUILD
* Restore -std=c99 when building makedoc
* Make sure host-independent CFLAGS are passed to CC_FOR_BUILD
* Let CC_FOR_BUILD carry CFLAGS_FOR_BUILD, there's no reason to split them
---
 Makefile.autosetup     |  2 +-
 auto.def               | 15 +++++++++------
 doc/Makefile.autosetup |  4 ++--
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Makefile.autosetup b/Makefile.autosetup
index f017c3f75..33ab69cd1 100644
--- a/Makefile.autosetup
+++ b/Makefile.autosetup
@@ -7,7 +7,7 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
 PWD=		@PWD@
 AR=		@AR@
 CC=		@CC@
-CC_FOR_BUILD=	@CC_FOR_BUILD@
+CC_FOR_BUILD=	@CC_FOR_BUILD@ @CFLAGS_FOR_BUILD@
 CPP=		@CPP@
 CFLAGS=		@CPPFLAGS@ @CFLAGS@ -I. -I@top_srcdir@ -Wall $(EXTRA_CFLAGS)
 LDFLAGS=	@LDFLAGS@ $(EXTRA_LDFLAGS)
diff --git a/auto.def b/auto.def
index 3f6b23b3b..9609f174b 100644
--- a/auto.def
+++ b/auto.def
@@ -183,6 +183,7 @@ if {1} {
   if {[cc-check-standards c99] eq {}} {
     user-error "C99 is required"
   }
+  define-append CFLAGS_FOR_BUILD -std=c99
 
   # Check for tools and programs
   cc-check-tools ar ranlib strip
@@ -212,13 +213,15 @@ if {1} {
   # Enable extensions (reverse-engineered from AC_SYSTEM_EXTENSIONS)
   if {1} {
     if {[cc-check-includes minix/config.h]} {
-      define-append CFLAGS -D_POSIX_SOURCE=1
-      define-append CFLAGS -D_POSIX_1_SOURCE=2
-      define-append CFLAGS -D_MINIX=1
+      lappend extensions -D_POSIX_SOURCE=1
+      lappend extensions -D_POSIX_1_SOURCE=2
+      lappend extensions -D_MINIX=1
     }
-    define-append CFLAGS -D_ALL_SOURCE=1
-    define-append CFLAGS -D_GNU_SOURCE=1
-    define-append CFLAGS -D__EXTENSIONS__
+    lappend extensions -D_ALL_SOURCE=1
+    lappend extensions -D_GNU_SOURCE=1
+    lappend extensions -D__EXTENSIONS__
+    define-append CFLAGS_FOR_BUILD {*}$extensions
+    define-append CFLAGS {*}$extensions
   }
   cc-with [list -cflags [get-define CFLAGS]]
 
diff --git a/doc/Makefile.autosetup b/doc/Makefile.autosetup
index a26234340..b1eb7b009 100644
--- a/doc/Makefile.autosetup
+++ b/doc/Makefile.autosetup
@@ -1,7 +1,7 @@
-MAKEDOC_CPP = $(CC_FOR_BUILD) $(CPPFLAGS) -D_MAKEDOC -E -C -I.
+MAKEDOC_CPP = $(CC_FOR_BUILD) -D_MAKEDOC -E -C -I.
 
 doc/makedoc$(EXEEXT): doc/makedoc.c
-	$(CC_FOR_BUILD) $(CPPFLAGS) $(CFLAGS) -o $@ doc/makedoc.c
+	$(CC_FOR_BUILD) -I. -o $@ doc/makedoc.c
 
 doc/neomuttrc: $(SRCDIR)/init.h doc/makedoc$(EXEEXT) $(SRCDIR)/doc/neomuttrc.head
 	sed -e 's,@docdir@,$(docdir),' $(SRCDIR)/doc/neomuttrc.head \
-- 
2.40.0