From baa6eac0406b3eb58343457cb6a47759da58c79d Mon Sep 17 00:00:00 2001 From: Darek Stojaczyk Date: Thu, 9 May 2019 08:57:32 +0200 Subject: [PATCH] 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 Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/453789 Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Jim Harris --- configure | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure b/configure index feb88736b..83b2d2be5 100755 --- a/configure +++ b/configure @@ -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