diff options
| -rw-r--r-- | crawl-ref/source/makefile | 5 | ||||
| -rwxr-xr-x | crawl-ref/source/util/gcc-gte.pl | 12 |
2 files changed, 8 insertions, 9 deletions
diff --git a/crawl-ref/source/makefile b/crawl-ref/source/makefile index 461e9bd05c..449980eb20 100644 --- a/crawl-ref/source/makefile +++ b/crawl-ref/source/makefile @@ -198,7 +198,6 @@ AR := $(CROSSHOST)-ar RANLIB := $(CROSSHOST)-ranlib endif GCC_GTE_4_0_0 := $(shell util/gcc-gte.pl $(GCC) 4.0.0) -GCC_GTE_4_2_0 := $(shell util/gcc-gte.pl $(GCC) 4.2.0) GCC_GTE_4_3_0 := $(shell util/gcc-gte.pl $(GCC) 4.3.0) # Define this to automatically generate code optimized for your machine @@ -326,7 +325,7 @@ INCLUDES_L += $(PNG_INCLUDE) $(FREETYPE_INCLUDE) $(SDL_INCLUDE) endif # TILES -ifeq ($(GCC_GTE_4_3_0),Yes) +ifeq ($(GCC_GTE_4_3_0),1) CFWARN_L += -Wno-array-bounds endif @@ -388,7 +387,7 @@ endif # Cygwin has a panic attack if we do this... ifndef NO_OPTIMIZE -ifneq ($(GCC_GTE_4_0_0),No) +ifneq ($(GCC_GTE_4_0_0),0) CFWARN_L += -Wuninitialized else CFWARN_L += -Wno-uninitialized diff --git a/crawl-ref/source/util/gcc-gte.pl b/crawl-ref/source/util/gcc-gte.pl index 686348c5f8..d919de534f 100755 --- a/crawl-ref/source/util/gcc-gte.pl +++ b/crawl-ref/source/util/gcc-gte.pl @@ -41,29 +41,29 @@ my $min_minor = $2; my $min_patch = $3; if ($local_major > $min_major) { - print "Yes\n"; + print "1"; exit 0; } if ($local_major < $min_major) { - print "No\n"; + print "0"; exit 0; } if ($local_minor > $min_minor) { - print "Yes\n"; + print "1"; exit 0; } if ($local_minor < $min_minor) { - print "No\n"; + print "0"; exit 0; } if ($local_patch < $min_patch) { - print "No\n"; + print "0"; exit 0; } -print "Yes\n"; +print "1"; exit 0; |