From 11be8813a20db25d87c965220bc7d846cc248dfc Mon Sep 17 00:00:00 2001
From: Paulo Matos <pmatos@linki.tools>
Date: Tue, 27 Oct 2020 13:34:10 +0100
Subject: [PATCH] Fix CFLAGS ordering to ensure users CFLAGS take precedence
 (#3466)

---
 racket/src/ChezScheme/c/Mf-a6fb    | 4 ++--
 racket/src/ChezScheme/c/Mf-a6le    | 4 ++--
 racket/src/ChezScheme/c/Mf-a6nb    | 4 ++--
 racket/src/ChezScheme/c/Mf-a6ob    | 4 ++--
 racket/src/ChezScheme/c/Mf-a6osx   | 4 ++--
 racket/src/ChezScheme/c/Mf-a6s2    | 4 ++--
 racket/src/ChezScheme/c/Mf-arm32le | 4 ++--
 racket/src/ChezScheme/c/Mf-arm64le | 4 ++--
 racket/src/ChezScheme/c/Mf-i3fb    | 4 ++--
 racket/src/ChezScheme/c/Mf-i3le    | 4 ++--
 racket/src/ChezScheme/c/Mf-i3nb    | 4 ++--
 racket/src/ChezScheme/c/Mf-i3ob    | 4 ++--
 racket/src/ChezScheme/c/Mf-i3osx   | 4 ++--
 racket/src/ChezScheme/c/Mf-ppc32le | 4 ++--
 14 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/racket/src/ChezScheme/c/Mf-a6fb b/racket/src/ChezScheme/c/Mf-a6fb
index 071326ba93..56f46957d8 100644
--- a/racket/src/ChezScheme/c/Mf-a6fb
+++ b/racket/src/ChezScheme/c/Mf-a6fb
@@ -41,7 +41,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main}
 	$C -rdynamic -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS}
 
 ../zlib/configure.log:
-	(cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} ${optFlags} -m64" ./configure --64)
+	(cd ../zlib; ${SetConfigEnv} CFLAGS="${optFlags} ${CFLAGS} -m64" ./configure --64)
 
 ../lz4/lib/liblz4.a: ${LZ4Sources}
-	(cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS} ${optFlags} -m64" ${MAKE} liblz4.a)
+	(cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${optFlags} ${CFLAGS} -m64" ${MAKE} liblz4.a)
diff --git a/racket/src/ChezScheme/c/Mf-a6le b/racket/src/ChezScheme/c/Mf-a6le
index 9e1b783388..70272db83e 100644
--- a/racket/src/ChezScheme/c/Mf-a6le
+++ b/racket/src/ChezScheme/c/Mf-a6le
@@ -40,7 +40,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main}
 	$C -rdynamic -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS}
 
 ../zlib/configure.log:
-	(cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} ${optFlags} -m64" ./configure --64)
+	(cd ../zlib; ${SetConfigEnv} CFLAGS="${optFlags} ${CFLAGS} -m64" ./configure --64)
 
 ../lz4/lib/liblz4.a: ${LZ4Sources}
-	(cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS} ${optFlags} -m64" ${MAKE} liblz4.a)
+	(cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${optFlags} ${CFLAGS} -m64" ${MAKE} liblz4.a)
diff --git a/racket/src/ChezScheme/c/Mf-a6nb b/racket/src/ChezScheme/c/Mf-a6nb
index 07657aebb7..b513a4bcfc 100644
--- a/racket/src/ChezScheme/c/Mf-a6nb
+++ b/racket/src/ChezScheme/c/Mf-a6nb
@@ -42,7 +42,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main}
 	paxctl +m ${Scheme}
 
 ../zlib/configure.log:
-	(cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} ${optFlags} -m64" ./configure --64)
+	(cd ../zlib; ${SetConfigEnv} CFLAGS="${optFlags} ${CFLAGS} -m64" ./configure --64)
 
 ../lz4/lib/liblz4.a: ${LZ4Sources}
-	(cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS} ${optFlags} -m64" ${MAKE} liblz4.a)
+	(cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${optFlags} ${CFLAGS} -m64" ${MAKE} liblz4.a)
diff --git a/racket/src/ChezScheme/c/Mf-a6ob b/racket/src/ChezScheme/c/Mf-a6ob
index 40b2ee4795..b2691574d3 100644
--- a/racket/src/ChezScheme/c/Mf-a6ob
+++ b/racket/src/ChezScheme/c/Mf-a6ob
@@ -41,7 +41,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main}
 	$C -rdynamic -Wl,--export-dynamic -Wl,-zwxneeded -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS}
 
 ../zlib/configure.log:
-	(cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} ${optFlags} -m64" ./configure --64)
+	(cd ../zlib; ${SetConfigEnv} CFLAGS="${optFlags} ${CFLAGS} -m64" ./configure --64)
 
 ../lz4/lib/liblz4.a: ${LZ4Sources}
-	(cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS} ${optFlags} -m64" ${MAKE} liblz4.a)
+	(cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${optFlags} ${CFLAGS} -m64" ${MAKE} liblz4.a)
diff --git a/racket/src/ChezScheme/c/Mf-a6osx b/racket/src/ChezScheme/c/Mf-a6osx
index deb4576d14..e9f9456c97 100644
--- a/racket/src/ChezScheme/c/Mf-a6osx
+++ b/racket/src/ChezScheme/c/Mf-a6osx
@@ -40,7 +40,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main}
 	$C -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS}
 
 ../zlib/configure.log:
-	(cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} ${optFlags} -m64" ./configure --64)
+	(cd ../zlib; ${SetConfigEnv} CFLAGS="${optFlags} ${CFLAGS} -m64" ./configure --64)
 
 ../lz4/lib/liblz4.a: ${LZ4Sources}
-	(cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS} ${optFlags} -m64" ${MAKE} liblz4.a)
+	(cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${optFlags} ${CFLAGS} -m64" ${MAKE} liblz4.a)
diff --git a/racket/src/ChezScheme/c/Mf-a6s2 b/racket/src/ChezScheme/c/Mf-a6s2
index e0150a8ca7..a33ccb76eb 100644
--- a/racket/src/ChezScheme/c/Mf-a6s2
+++ b/racket/src/ChezScheme/c/Mf-a6s2
@@ -40,7 +40,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main}
 	$C -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS}
 
 ../zlib/configure.log:
-	(cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} ${optFlags} -m64" ./configure --64)
+	(cd ../zlib; ${SetConfigEnv} CFLAGS="${optFlags} ${CFLAGS} -m64" ./configure --64)
 
 ../lz4/lib/liblz4.a: ${LZ4Sources}
-	(cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS} ${optFlags} -m64" ${MAKE} liblz4.a)
+	(cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${optFlags} ${CFLAGS} -m64" ${MAKE} liblz4.a)
diff --git a/racket/src/ChezScheme/c/Mf-arm32le b/racket/src/ChezScheme/c/Mf-arm32le
index d87df071b6..e14203bb9f 100644
--- a/racket/src/ChezScheme/c/Mf-arm32le
+++ b/racket/src/ChezScheme/c/Mf-arm32le
@@ -40,7 +40,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main}
 	$C -rdynamic -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS}
 
 ../zlib/configure.log:
-	(cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} ${optFlags}" ./configure)
+	(cd ../zlib; ${SetConfigEnv} CFLAGS="${optFlags} ${CFLAGS}" ./configure)
 
 ../lz4/lib/liblz4.a: ${LZ4Sources}
-	(cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS} ${optFlags}" ${MAKE} liblz4.a)
+	(cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${optFlags} ${CFLAGS}" ${MAKE} liblz4.a)
diff --git a/racket/src/ChezScheme/c/Mf-arm64le b/racket/src/ChezScheme/c/Mf-arm64le
index ec1d40f8fe..8bc7581806 100644
--- a/racket/src/ChezScheme/c/Mf-arm64le
+++ b/racket/src/ChezScheme/c/Mf-arm64le
@@ -40,7 +40,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main}
 	$C -rdynamic -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS}
 
 ../zlib/configure.log:
-	(cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} ${optFlags}" ./configure)
+	(cd ../zlib; ${SetConfigEnv} CFLAGS="${optFlags} ${CFLAGS}" ./configure)
 
 ../lz4/lib/liblz4.a: ${LZ4Sources}
-	(cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS} ${optFlags}" ${MAKE} liblz4.a)
+	(cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${optFlags} ${CFLAGS}" ${MAKE} liblz4.a)
diff --git a/racket/src/ChezScheme/c/Mf-i3fb b/racket/src/ChezScheme/c/Mf-i3fb
index a604efa732..d8317d54a8 100644
--- a/racket/src/ChezScheme/c/Mf-i3fb
+++ b/racket/src/ChezScheme/c/Mf-i3fb
@@ -41,7 +41,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main}
 	$C -rdynamic -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS}
 
 ../zlib/configure.log:
-	(cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} ${optFlags} -m32" ./configure)
+	(cd ../zlib; ${SetConfigEnv} CFLAGS="${optFlags} ${CFLAGS} -m32" ./configure)
 
 ../lz4/lib/liblz4.a: ${LZ4Sources}
-	(cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS} ${optFlags} -m32" ${MAKE} liblz4.a)
+	(cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${optFlags} ${CFLAGS} -m32" ${MAKE} liblz4.a)
diff --git a/racket/src/ChezScheme/c/Mf-i3le b/racket/src/ChezScheme/c/Mf-i3le
index 6a8e95fa26..04c1f89174 100644
--- a/racket/src/ChezScheme/c/Mf-i3le
+++ b/racket/src/ChezScheme/c/Mf-i3le
@@ -40,7 +40,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main}
 	$C -rdynamic -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS}
 
 ../zlib/configure.log:
-	(cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} ${optFlags} -m32" ./configure)
+	(cd ../zlib; ${SetConfigEnv} CFLAGS="${optFlags} ${CFLAGS} -m32" ./configure)
 
 ../lz4/lib/liblz4.a: ${LZ4Sources}
-	(cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS} ${optFlags} -m32" ${MAKE} liblz4.a)
+	(cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${optFlags} ${CFLAGS} -m32" ${MAKE} liblz4.a)
diff --git a/racket/src/ChezScheme/c/Mf-i3nb b/racket/src/ChezScheme/c/Mf-i3nb
index 70428c0203..8419a5e283 100644
--- a/racket/src/ChezScheme/c/Mf-i3nb
+++ b/racket/src/ChezScheme/c/Mf-i3nb
@@ -42,7 +42,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main}
 	paxctl +m ${Scheme}
 
 ../zlib/configure.log:
-	(cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} ${optFlags} -m32" ./configure)
+	(cd ../zlib; ${SetConfigEnv} CFLAGS="${optFlags} ${CFLAGS} -m32" ./configure)
 
 ../lz4/lib/liblz4.a: ${LZ4Sources}
-	(cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS} ${optFlags} -m32" ${MAKE} liblz4.a)
+	(cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${optFlags} ${CFLAGS} -m32" ${MAKE} liblz4.a)
diff --git a/racket/src/ChezScheme/c/Mf-i3ob b/racket/src/ChezScheme/c/Mf-i3ob
index 59204ea5ba..4546e8e12b 100644
--- a/racket/src/ChezScheme/c/Mf-i3ob
+++ b/racket/src/ChezScheme/c/Mf-i3ob
@@ -41,7 +41,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main}
 	$C -rdynamic -Wl,--export-dynamic -Wl,-zwxneeded -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS}
 
 ../zlib/configure.log:
-	(cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} ${optFlags} -m32" ./configure)
+	(cd ../zlib; ${SetConfigEnv} CFLAGS="${optFlags} ${CFLAGS} -m32" ./configure)
 
 ../lz4/lib/liblz4.a: ${LZ4Sources}
-	(cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS} ${optFlags} -m32" ${MAKE} liblz4.a)
+	(cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${optFlags} ${CFLAGS} -m32" ${MAKE} liblz4.a)
diff --git a/racket/src/ChezScheme/c/Mf-i3osx b/racket/src/ChezScheme/c/Mf-i3osx
index 5f9be957a7..9adf8303ba 100644
--- a/racket/src/ChezScheme/c/Mf-i3osx
+++ b/racket/src/ChezScheme/c/Mf-i3osx
@@ -40,7 +40,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main}
 	$C -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS}
 
 ../zlib/configure.log:
-	(cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} ${optFlags} -m32" ./configure)
+	(cd ../zlib; ${SetConfigEnv} CFLAGS="${optFlags} ${CFLAGS} -m32" ./configure)
 
 ../lz4/lib/liblz4.a: ${LZ4Sources}
-	(cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS} ${optFlags} -m32" ${MAKE} liblz4.a)
+	(cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${optFlags} ${CFLAGS} -m32" ${MAKE} liblz4.a)
diff --git a/racket/src/ChezScheme/c/Mf-ppc32le b/racket/src/ChezScheme/c/Mf-ppc32le
index 0dde10b84e..a755bb6c0a 100644
--- a/racket/src/ChezScheme/c/Mf-ppc32le
+++ b/racket/src/ChezScheme/c/Mf-ppc32le
@@ -40,7 +40,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main}
 	$C -rdynamic -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS}
 
 ../zlib/configure.log:
-	(cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} ${optFlags} -m32" ./configure)
+	(cd ../zlib; ${SetConfigEnv} CFLAGS="${optFlags} ${CFLAGS} -m32" ./configure)
 
 ../lz4/lib/liblz4.a: ${LZ4Sources}
-	(cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS} ${optFlags} -m32" ${MAKE} liblz4.a)
+	(cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${optFlags} ${CFLAGS} -m32" ${MAKE} liblz4.a)