Commit baa6eac0 authored May 09, 2019 by Darek Stojaczyk Committed by Jim Harris May 10, 2019

configure: clear cc.flags.mk on each run



Once set, those flags could be only overwritten - there
was no way to unset them using our configure script.

$ CFLAGS="-pedantic" ./configure
$ ./configure # pedantic still set

We'll now clear cc.flags.mk on each configure run, just
like we already do with config.mk.

Change-Id: I75c88606f21ca2c62bd322f3972ebf7dd815258b
Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/453789


Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>

parent b4dc10fb

configure

+3 −1

Original line number	Diff line number	Diff line
		@@ -605,13 +605,15 @@ for key in ${!CONFIG[@]}; do
		done
		# On FreeBSD sed -i 'SUFFIX' - SUFFIX is mandatory. So no way but to delete the backed file.
		rm -f mk/config.mk.bak
		echo "done."

		# Environment variables
		echo -n "Creating mk/cc.flags.mk..."
		rm -f mk/cc.flags.mk
		[ -n "$CFLAGS" ] && echo "CFLAGS?=$CFLAGS" > mk/cc.flags.mk
		[ -n "$CXXFLAGS" ] && echo "CXXFLAGS?=$CXXFLAGS" >> mk/cc.flags.mk
		[ -n "$LDFLAGS" ] && echo "LDFLAGS?=$LDFLAGS" >> mk/cc.flags.mk
		[ -n "$DESTDIR" ] && echo "DESTDIR?=$DESTDIR" >> mk/cc.flags.mk

		echo "done."

		if [[ "$OSTYPE" == "freebsd"* ]]; then