diff options
| author | Samuel Bronson <naesten@gmail.com> | 2013-05-14 14:33:00 -0400 |
|---|---|---|
| committer | Samuel Bronson <naesten@gmail.com> | 2013-05-14 14:46:29 -0400 |
| commit | ded950aa25a8f3b911acc4f50fd6efbac46d3e28 (patch) | |
| tree | 911af8cadc3f8799615b880d4cfff8f3df14dfa2 /crawl-ref/source/Makefile | |
| parent | c7ccb900797e22ab45dd1fd0185b94041f78d83e (diff) | |
| download | crawl-ref-ded950aa25a8f3b911acc4f50fd6efbac46d3e28.tar.gz crawl-ref-ded950aa25a8f3b911acc4f50fd6efbac46d3e28.zip | |
Handle single-quotes and whitespace in CFLAGS difference check.
This will probably miss changes in the number of consequtive spaces
used in (say) -D flags, but it does put an end to the full rebuilds
we've been having since probably 0.13-a0-692-g87817ed (though these
would presumably also have gone away after the tournament ended).
I'm a bit puzzled about how the whitespace difference came about,
though ...
Diffstat (limited to 'crawl-ref/source/Makefile')
| -rw-r--r-- | crawl-ref/source/Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile index d6a07621c3..296fe0fa30 100644 --- a/crawl-ref/source/Makefile +++ b/crawl-ref/source/Makefile @@ -1144,8 +1144,11 @@ ifneq ($(GOALS),$(filter clean test %-windows,$(GOALS))) # This should eliminate an annoying need to use 'make clean' every time. # -TRACK_CFLAGS = $(subst ','\'',$(CC) $(CXX) $(ALL_CFLAGS)) # (stray ' for highlights) -OLD_CFLAGS = $(shell cat .cflags 2>/dev/null) +TRACK_CFLAGS = $(strip $(subst ','\'',$(CC) $(CXX) $(ALL_CFLAGS))) + # (stray ' for highlights) +OLD_CFLAGS = $(strip $(subst ','\'',$(shell cat .cflags 2>/dev/null))) + # (stray ' for highlights) + ifneq ($(TRACK_CFLAGS),$(OLD_CFLAGS)) NEED_REBUILD = y endif |