From 01a40286c26ff62ff74fff4e89da618442768ffd Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Mon, 9 Dec 2019 08:34:50 -0700 Subject: [PATCH] propagate `CC` and `CPPFLAGS` to ZLib and LZ4 builds original commit: cbb7c5f21a879ee90293c3abf99d344c4fc42b7f --- c/Mf-a6fb | 4 ++-- c/Mf-a6le | 4 ++-- c/Mf-a6nb | 4 ++-- c/Mf-a6ob | 4 ++-- c/Mf-a6osx | 4 ++-- c/Mf-a6s2 | 4 ++-- c/Mf-base | 3 +++ c/Mf-i3fb | 4 ++-- c/Mf-i3le | 4 ++-- c/Mf-i3nb | 4 ++-- c/Mf-i3ob | 4 ++-- c/Mf-i3osx | 4 ++-- c/Mf-i3qnx | 4 ++-- c/Mf-i3s2 | 4 ++-- c/Mf-ppc32le | 4 ++-- c/Mf-ta6fb | 4 ++-- c/Mf-ta6le | 4 ++-- c/Mf-ta6nb | 4 ++-- c/Mf-ta6ob | 4 ++-- c/Mf-ta6osx | 4 ++-- c/Mf-ta6s2 | 4 ++-- c/Mf-ti3fb | 4 ++-- c/Mf-ti3le | 4 ++-- c/Mf-ti3nb | 4 ++-- c/Mf-ti3ob | 4 ++-- c/Mf-ti3osx | 4 ++-- c/Mf-ti3s2 | 4 ++-- c/Mf-tppc32le | 4 ++-- 28 files changed, 57 insertions(+), 54 deletions(-) diff --git a/c/Mf-a6fb b/c/Mf-a6fb index 43bf5900ba..d41132ec5c 100644 --- a/c/Mf-a6fb +++ b/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; CFLAGS="${CFLAGS} -m64" ./configure --64) + (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m64" ./configure --64) ../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; CFLAGS="${CFLAGS} -m64" ${MAKE} liblz4.a) + (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m64" ${MAKE} liblz4.a) diff --git a/c/Mf-a6le b/c/Mf-a6le index 1564cce947..a5c2792895 100644 --- a/c/Mf-a6le +++ b/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; CFLAGS="${CFLAGS} -m64" ./configure --64) + (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m64" ./configure --64) ../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; CFLAGS="${CFLAGS} -m64" ${MAKE} liblz4.a) + (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m64" ${MAKE} liblz4.a) diff --git a/c/Mf-a6nb b/c/Mf-a6nb index 42b5483d60..c32d363506 100644 --- a/c/Mf-a6nb +++ b/c/Mf-a6nb @@ -42,7 +42,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main} paxctl +m ${Scheme} ../zlib/configure.log: - (cd ../zlib; CFLAGS="${CFLAGS} -m64" ./configure --64) + (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m64" ./configure --64) ../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; CFLAGS="${CFLAGS} -m64" ${MAKE} liblz4.a) + (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m64" ${MAKE} liblz4.a) diff --git a/c/Mf-a6ob b/c/Mf-a6ob index fe117c67f1..cdd911cd24 100644 --- a/c/Mf-a6ob +++ b/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; CFLAGS="${CFLAGS} -m64" ./configure --64) + (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m64" ./configure --64) ../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; CFLAGS="${CFLAGS} -m64" ${MAKE} liblz4.a) + (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m64" ${MAKE} liblz4.a) diff --git a/c/Mf-a6osx b/c/Mf-a6osx index 1977f3cf28..54f13f0c71 100644 --- a/c/Mf-a6osx +++ b/c/Mf-a6osx @@ -40,7 +40,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main} $C -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS} ../zlib/configure.log: - (cd ../zlib; CFLAGS="${CFLAGS} -m64" ./configure --64) + (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m64" ./configure --64) ../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; CFLAGS="${CFLAGS} -m64" ${MAKE} liblz4.a) + (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m64" ${MAKE} liblz4.a) diff --git a/c/Mf-a6s2 b/c/Mf-a6s2 index 6a8e403656..382edbeff1 100644 --- a/c/Mf-a6s2 +++ b/c/Mf-a6s2 @@ -40,7 +40,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main} $C -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS} ../zlib/configure.log: - (cd ../zlib; CFLAGS="${CFLAGS} -m64" ./configure --64) + (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m64" ./configure --64) ../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; CFLAGS="${CFLAGS} -m64" ${MAKE} liblz4.a) + (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m64" ${MAKE} liblz4.a) diff --git a/c/Mf-base b/c/Mf-base index 74c8b4896b..fc952aa17a 100644 --- a/c/Mf-base +++ b/c/Mf-base @@ -21,6 +21,9 @@ SchemeBoot=../boot/$m/scheme.boot Main=../boot/$m/main.$o Scheme=../bin/$m/scheme +# CFLAGS is propagated separately: +SetConfigEnv = CC="${CC}" CPPFLAGS="${CPPFLAGS}" + # One of these sets is referenced in Mf-config to select between # linking with kernel.o or libkernel.a diff --git a/c/Mf-i3fb b/c/Mf-i3fb index 187e03624f..71aef4e42e 100644 --- a/c/Mf-i3fb +++ b/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; CFLAGS="${CFLAGS} -m32" ./configure) + (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m32" ./configure) ../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; CFLAGS="${CFLAGS} -m32" ${MAKE} liblz4.a) + (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m32" ${MAKE} liblz4.a) diff --git a/c/Mf-i3le b/c/Mf-i3le index 1cd31eb623..0bef92a7ce 100644 --- a/c/Mf-i3le +++ b/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; CFLAGS="${CFLAGS} -m32" ./configure) + (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m32" ./configure) ../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; CFLAGS="${CFLAGS} -m32" ${MAKE} liblz4.a) + (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m32" ${MAKE} liblz4.a) diff --git a/c/Mf-i3nb b/c/Mf-i3nb index 05592cf5eb..75db395d5f 100644 --- a/c/Mf-i3nb +++ b/c/Mf-i3nb @@ -42,7 +42,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main} paxctl +m ${Scheme} ../zlib/configure.log: - (cd ../zlib; CFLAGS="${CFLAGS} -m32" ./configure) + (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m32" ./configure) ../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; CFLAGS="${CFLAGS} -m32" ${MAKE} liblz4.a) + (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m32" ${MAKE} liblz4.a) diff --git a/c/Mf-i3ob b/c/Mf-i3ob index a1a6d39112..732f4b3629 100644 --- a/c/Mf-i3ob +++ b/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; CFLAGS="${CFLAGS} -m32" ./configure) + (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m32" ./configure) ../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; CFLAGS="${CFLAGS} -m32" ${MAKE} liblz4.a) + (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m32" ${MAKE} liblz4.a) diff --git a/c/Mf-i3osx b/c/Mf-i3osx index 1a4b181d04..ea8060fc32 100644 --- a/c/Mf-i3osx +++ b/c/Mf-i3osx @@ -40,7 +40,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main} $C -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS} ../zlib/configure.log: - (cd ../zlib; CFLAGS="${CFLAGS} -m32" ./configure) + (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m32" ./configure) ../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; CFLAGS="${CFLAGS} -m32" ${MAKE} liblz4.a) + (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m32" ${MAKE} liblz4.a) diff --git a/c/Mf-i3qnx b/c/Mf-i3qnx index 7d03738866..c55bf6cc72 100644 --- a/c/Mf-i3qnx +++ b/c/Mf-i3qnx @@ -41,7 +41,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main} $C -Wl,--export-dynamic -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS} ../zlib/configure.log: - (cd ../zlib; CFLAGS="${CFLAGS} -m32" ./configure) + (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m32" ./configure) ../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; CFLAGS="${CFLAGS} -m32" ${MAKE} liblz4.a) + (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m32" ${MAKE} liblz4.a) diff --git a/c/Mf-i3s2 b/c/Mf-i3s2 index c0dabc3688..7741bab6bf 100644 --- a/c/Mf-i3s2 +++ b/c/Mf-i3s2 @@ -40,7 +40,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main} $C -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS} ../zlib/configure.log: - (cd ../zlib; CFLAGS="${CFLAGS} -m32" ./configure) + (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m32" ./configure) ../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; CFLAGS="${CFLAGS} -m32" ${MAKE} liblz4.a) + (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m32" ${MAKE} liblz4.a) diff --git a/c/Mf-ppc32le b/c/Mf-ppc32le index 66f8753fe6..27d6b178c7 100644 --- a/c/Mf-ppc32le +++ b/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; CFLAGS="${CFLAGS} -m32" ./configure) + (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m32" ./configure) ../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; CFLAGS="${CFLAGS} -m32" ${MAKE} liblz4.a) + (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m32" ${MAKE} liblz4.a) diff --git a/c/Mf-ta6fb b/c/Mf-ta6fb index 6b362e9674..a7ced1b47f 100644 --- a/c/Mf-ta6fb +++ b/c/Mf-ta6fb @@ -41,7 +41,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main} $C -rdynamic -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS} ../zlib/configure.log: - (cd ../zlib; CFLAGS="${CFLAGS} -m64" ./configure --64) + (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m64" ./configure --64) ../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; CFLAGS="${CFLAGS} -m64" ${MAKE} liblz4.a) + (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m64" ${MAKE} liblz4.a) diff --git a/c/Mf-ta6le b/c/Mf-ta6le index 6adb83fb48..36943df18e 100644 --- a/c/Mf-ta6le +++ b/c/Mf-ta6le @@ -40,7 +40,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main} $C -rdynamic -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS} ../zlib/configure.log: - (cd ../zlib; CFLAGS="${CFLAGS} -m64" ./configure --64) + (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m64" ./configure --64) ../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; CFLAGS="${CFLAGS} -m64" ${MAKE} liblz4.a) + (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m64" ${MAKE} liblz4.a) diff --git a/c/Mf-ta6nb b/c/Mf-ta6nb index 6133398e03..93266a86ff 100644 --- a/c/Mf-ta6nb +++ b/c/Mf-ta6nb @@ -42,7 +42,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main} paxctl +m ${Scheme} ../zlib/configure.log: - (cd ../zlib; CFLAGS="${CFLAGS} -m64" ./configure --64) + (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m64" ./configure --64) ../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; CFLAGS="${CFLAGS} -m64" ${MAKE} liblz4.a) + (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m64" ${MAKE} liblz4.a) diff --git a/c/Mf-ta6ob b/c/Mf-ta6ob index 74857da7f8..e52300c6c0 100644 --- a/c/Mf-ta6ob +++ b/c/Mf-ta6ob @@ -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; CFLAGS="${CFLAGS} -m64" ./configure --64) + (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m64" ./configure --64) ../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; CFLAGS="${CFLAGS} -m64" ${MAKE} liblz4.a) + (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m64" ${MAKE} liblz4.a) diff --git a/c/Mf-ta6osx b/c/Mf-ta6osx index 85c57c986c..6499ac2522 100644 --- a/c/Mf-ta6osx +++ b/c/Mf-ta6osx @@ -40,7 +40,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main} $C -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS} ../zlib/configure.log: - (cd ../zlib; CFLAGS="${CFLAGS} -m64" ./configure --64) + (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m64" ./configure --64) ../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; CFLAGS="${CFLAGS} -m64" ${MAKE} liblz4.a) + (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m64" ${MAKE} liblz4.a) diff --git a/c/Mf-ta6s2 b/c/Mf-ta6s2 index dbe035fe3f..73c939bcd6 100644 --- a/c/Mf-ta6s2 +++ b/c/Mf-ta6s2 @@ -40,7 +40,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main} $C -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS} ../zlib/configure.log: - (cd ../zlib; CFLAGS="${CFLAGS} -m64" ./configure --64) + (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m64" ./configure --64) ../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; CFLAGS="${CFLAGS} -m64" ${MAKE} liblz4.a) + (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m64" ${MAKE} liblz4.a) diff --git a/c/Mf-ti3fb b/c/Mf-ti3fb index bb4d8125bb..1dbc2fb0dd 100644 --- a/c/Mf-ti3fb +++ b/c/Mf-ti3fb @@ -41,7 +41,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main} $C -rdynamic -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS} ../zlib/configure.log: - (cd ../zlib; CFLAGS="${CFLAGS} -m32" ./configure) + (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m32" ./configure) ../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; CFLAGS="${CFLAGS} -m32" ${MAKE} liblz4.a) + (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m32" ${MAKE} liblz4.a) diff --git a/c/Mf-ti3le b/c/Mf-ti3le index f923dc25e2..87fa03896a 100644 --- a/c/Mf-ti3le +++ b/c/Mf-ti3le @@ -40,7 +40,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main} $C -rdynamic -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS} ../zlib/configure.log: - (cd ../zlib; CFLAGS="${CFLAGS} -m32" ./configure) + (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m32" ./configure) ../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; CFLAGS="${CFLAGS} -m32" ${MAKE} liblz4.a) + (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m32" ${MAKE} liblz4.a) diff --git a/c/Mf-ti3nb b/c/Mf-ti3nb index db753ac7dc..c33d7d983c 100644 --- a/c/Mf-ti3nb +++ b/c/Mf-ti3nb @@ -42,7 +42,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main} paxctl +m ${Scheme} ../zlib/configure.log: - (cd ../zlib; CFLAGS="${CFLAGS} -m32" ./configure) + (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m32" ./configure) ../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; CFLAGS="${CFLAGS} -m32" ${MAKE} liblz4.a) + (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m32" ${MAKE} liblz4.a) diff --git a/c/Mf-ti3ob b/c/Mf-ti3ob index 381ebca0cf..20aaf02156 100644 --- a/c/Mf-ti3ob +++ b/c/Mf-ti3ob @@ -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; CFLAGS="${CFLAGS} -m32" ./configure) + (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m32" ./configure) ../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; CFLAGS="${CFLAGS} -m32" ${MAKE} liblz4.a) + (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m32" ${MAKE} liblz4.a) diff --git a/c/Mf-ti3osx b/c/Mf-ti3osx index 1421c07f93..254f2757c2 100644 --- a/c/Mf-ti3osx +++ b/c/Mf-ti3osx @@ -40,7 +40,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main} $C -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS} ../zlib/configure.log: - (cd ../zlib; CFLAGS="${CFLAGS} -m32" ./configure) + (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m32" ./configure) ../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; CFLAGS="${CFLAGS} -m32" ${MAKE} liblz4.a) + (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m32" ${MAKE} liblz4.a) diff --git a/c/Mf-ti3s2 b/c/Mf-ti3s2 index a8fd5da99f..407e25fbbc 100644 --- a/c/Mf-ti3s2 +++ b/c/Mf-ti3s2 @@ -40,7 +40,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main} $C -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS} ../zlib/configure.log: - (cd ../zlib; CFLAGS="${CFLAGS} -m32" ./configure) + (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m32" ./configure) ../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; CFLAGS="${CFLAGS} -m32" ${MAKE} liblz4.a) + (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m32" ${MAKE} liblz4.a) diff --git a/c/Mf-tppc32le b/c/Mf-tppc32le index 486b8524f7..2baf01ddf5 100644 --- a/c/Mf-tppc32le +++ b/c/Mf-tppc32le @@ -40,7 +40,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main} $C -rdynamic -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS} ../zlib/configure.log: - (cd ../zlib; CFLAGS="${CFLAGS} -m32" ./configure) + (cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m32" ./configure) ../lz4/lib/liblz4.a: ${LZ4Sources} - (cd ../lz4/lib; CFLAGS="${CFLAGS} -m32" ${MAKE} liblz4.a) + (cd ../lz4/lib; ${SetConfigEnv} CFLAGS="${CFLAGS} -m32" ${MAKE} liblz4.a)