summaryrefslogtreecommitdiff
path: root/src/Makefile
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-06-18 23:31:55 +0200
committerBram Moolenaar <Bram@vim.org>2013-06-18 23:31:55 +0200
commita6cc03101e30d55d4039d539ed732bc02ffd909b (patch)
treebfe0640dd939933ce014d8ff42f8388e32da0bdd /src/Makefile
parentdb250526bbeac519665605127c18aad3ce2853ed (diff)
downloadvim-git-a6cc03101e30d55d4039d539ed732bc02ffd909b.tar.gz
updated for version 7.3.1221v7.3.1221
Problem: When build flags change "make distclean" run into a configure error. Solution: When CFLAGS changes delete auto/config.cache. Also avoid adding duplicate text to flags.
Diffstat (limited to 'src/Makefile')
-rw-r--r--src/Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/Makefile b/src/Makefile
index 39e0e32cb..39bcbd268 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1655,6 +1655,11 @@ tools: $(TOOLS)
# sure configure is run when it's needed.
#
config auto/config.mk: auto/configure config.mk.in config.h.in
+ if test -f auto/config.cache && \
+ grep '^ac_cv_env_CFLAGS_value=' auto/config.cache > /dev/null && \
+ ! grep -x -F 'ac_cv_env_CFLAGS_value=$(CFLAGS)' auto/config.cache > /dev/null; then \
+ rm auto/config.cache; \
+ fi
GUI_INC_LOC="$(GUI_INC_LOC)" GUI_LIB_LOC="$(GUI_LIB_LOC)" \
CC="$(CC)" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" \
LDFLAGS="$(LDFLAGS)" $(CONF_SHELL) srcdir="$(srcdir)" \