# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1532781095 -10800
# Node ID edf99e944ce61b0d5556d83328d71f0d21ec448a
# Parent  f9a6a676a923d830045c20103e977af694bf2649
cook, cook.conf: move macro definition from CFLAGS and CXXFLAGS to CPPFLAGS

diff -r f9a6a676a923 -r edf99e944ce6 cook
--- a/cook	Sat Jul 21 04:55:26 2018 +0300
+++ b/cook	Sat Jul 28 15:31:35 2018 +0300
@@ -871,6 +871,8 @@
 	if grep -q ^compile_rules $receipt; then
 		_ 'Executing: %s' 'compile_rules'
 		echo "CFLAGS   : $CFLAGS"
+		echo "CXXLAGS  : $CXXFLAGS"
+		echo "CPPFLAGS : $CPPFLAGS"
 		echo "LDFLAGS  : $LDFLAGS"
 		[ -d "$src" ] && cd $src
 		patchit
diff -r f9a6a676a923 -r edf99e944ce6 cook.conf
--- a/cook.conf	Sat Jul 21 04:55:26 2018 +0300
+++ b/cook.conf	Sat Jul 28 15:31:35 2018 +0300
@@ -81,12 +81,26 @@
 # We use this flag against some flavors of the Spectre vulnerability.
 # FIXME: it looks like the flag '-mindirect-branch=thunk-extern' is recommended,
 # but no one app is compiled using it even using GCC-7.3. Is something wrong?
+#
+# Curl configure says:
+# configure: CFLAGS note: CFLAGS should only be used to specify C compiler flags,
+# not macro definitions. Use CPPFLAGS for: -D_GLIBCXX_USE_C99_MATH=1
+#
 case "$ARCH" in
-	i?86)   CFLAGS="-march=$ARCH  -Os -pipe -mindirect-branch=thunk -D_GLIBCXX_USE_C99_MATH=1";;
-	x86_64) CFLAGS="-march=nocona -Os -pipe -mindirect-branch=thunk -D_GLIBCXX_USE_C99_MATH=1";;
-	arm*)   CFLAGS="-march=armv6  -O2";; # FIXME
+	i?86)
+		CFLAGS="-march=$ARCH -Os -pipe -mindirect-branch=thunk"
+		CPPFLAGS="-D_GLIBCXX_USE_C99_MATH=1"
+		;;
+	x86_64)
+		CFLAGS="-march=nocona -Os -pipe -mindirect-branch=thunk"
+		CPPFLAGS="-D_GLIBCXX_USE_C99_MATH=1"
+		;;
+	arm*)
+		CFLAGS="-march=armv6  -O2" # FIXME
+		;;
 esac
 CXXFLAGS="$CFLAGS"
+export CFLAGS CXXFLAGS CPPFLAGS
 
 # Binutils 2.22 breaks many packages built without LDFLAGS set correctly.
 #LDFLAGS="-Wl,--copy-dt-needed-entries -lXt"