Fix CFLAGS ordering to ensure users CFLAGS take precedence (#3466)

This commit is contained in:
Paulo Matos 2020-10-27 13:34:10 +01:00 committed by GitHub
parent 62f444d4e1
commit 11be8813a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 28 additions and 28 deletions

View File

@ -41,7 +41,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main}
$C -rdynamic -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS} $C -rdynamic -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS}
../zlib/configure.log: ../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} ../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)

View File

@ -40,7 +40,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main}
$C -rdynamic -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS} $C -rdynamic -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS}
../zlib/configure.log: ../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} ../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)

View File

@ -42,7 +42,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main}
paxctl +m ${Scheme} paxctl +m ${Scheme}
../zlib/configure.log: ../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} ../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)

View File

@ -41,7 +41,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main}
$C -rdynamic -Wl,--export-dynamic -Wl,-zwxneeded -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS} $C -rdynamic -Wl,--export-dynamic -Wl,-zwxneeded -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS}
../zlib/configure.log: ../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} ../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)

View File

@ -40,7 +40,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main}
$C -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS} $C -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS}
../zlib/configure.log: ../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} ../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)

View File

@ -40,7 +40,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main}
$C -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS} $C -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS}
../zlib/configure.log: ../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} ../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)

View File

@ -40,7 +40,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main}
$C -rdynamic -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS} $C -rdynamic -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS}
../zlib/configure.log: ../zlib/configure.log:
(cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} ${optFlags}" ./configure) (cd ../zlib; ${SetConfigEnv} CFLAGS="${optFlags} ${CFLAGS}" ./configure)
../lz4/lib/liblz4.a: ${LZ4Sources} ../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)

View File

@ -40,7 +40,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main}
$C -rdynamic -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS} $C -rdynamic -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS}
../zlib/configure.log: ../zlib/configure.log:
(cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} ${optFlags}" ./configure) (cd ../zlib; ${SetConfigEnv} CFLAGS="${optFlags} ${CFLAGS}" ./configure)
../lz4/lib/liblz4.a: ${LZ4Sources} ../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)

View File

@ -41,7 +41,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main}
$C -rdynamic -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS} $C -rdynamic -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS}
../zlib/configure.log: ../zlib/configure.log:
(cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} ${optFlags} -m32" ./configure) (cd ../zlib; ${SetConfigEnv} CFLAGS="${optFlags} ${CFLAGS} -m32" ./configure)
../lz4/lib/liblz4.a: ${LZ4Sources} ../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)

View File

@ -40,7 +40,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main}
$C -rdynamic -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS} $C -rdynamic -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS}
../zlib/configure.log: ../zlib/configure.log:
(cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} ${optFlags} -m32" ./configure) (cd ../zlib; ${SetConfigEnv} CFLAGS="${optFlags} ${CFLAGS} -m32" ./configure)
../lz4/lib/liblz4.a: ${LZ4Sources} ../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)

View File

@ -42,7 +42,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main}
paxctl +m ${Scheme} paxctl +m ${Scheme}
../zlib/configure.log: ../zlib/configure.log:
(cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} ${optFlags} -m32" ./configure) (cd ../zlib; ${SetConfigEnv} CFLAGS="${optFlags} ${CFLAGS} -m32" ./configure)
../lz4/lib/liblz4.a: ${LZ4Sources} ../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)

View File

@ -41,7 +41,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main}
$C -rdynamic -Wl,--export-dynamic -Wl,-zwxneeded -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS} $C -rdynamic -Wl,--export-dynamic -Wl,-zwxneeded -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS}
../zlib/configure.log: ../zlib/configure.log:
(cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} ${optFlags} -m32" ./configure) (cd ../zlib; ${SetConfigEnv} CFLAGS="${optFlags} ${CFLAGS} -m32" ./configure)
../lz4/lib/liblz4.a: ${LZ4Sources} ../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)

View File

@ -40,7 +40,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main}
$C -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS} $C -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS}
../zlib/configure.log: ../zlib/configure.log:
(cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} ${optFlags} -m32" ./configure) (cd ../zlib; ${SetConfigEnv} CFLAGS="${optFlags} ${CFLAGS} -m32" ./configure)
../lz4/lib/liblz4.a: ${LZ4Sources} ../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)

View File

@ -40,7 +40,7 @@ ${Scheme}: ${Kernel} ${KernelLinkDeps} ${Main}
$C -rdynamic -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS} $C -rdynamic -o ${Scheme} ${Main} ${Kernel} ${mdclib} ${KernelLinkLibs} ${LDFLAGS}
../zlib/configure.log: ../zlib/configure.log:
(cd ../zlib; ${SetConfigEnv} CFLAGS="${CFLAGS} ${optFlags} -m32" ./configure) (cd ../zlib; ${SetConfigEnv} CFLAGS="${optFlags} ${CFLAGS} -m32" ./configure)
../lz4/lib/liblz4.a: ${LZ4Sources} ../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)