Fix CFLAGS ordering to ensure users CFLAGS take precedence (#3466)
This commit is contained in:
parent
62f444d4e1
commit
11be8813a2
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue
Block a user