Commit ecd5f85d authored by Keith Bennett's avatar Keith Bennett

Merge branch 'hotfix/1.4.2'

parents 8d5c950b b90adc28
......@@ -90,18 +90,21 @@ ifeq ($(strip $(COMPILER)),gfortran)
GNUMAJOR := $(shell echo $(GNUVER) | cut -f1 -d\.)
GNUMINOR := $(shell echo $(GNUVER) | cut -f2 -d\.)
# Allow for 99 minor revisions
GNUVER := $(shell expr 100 \* $(GNUMAJOR) + $(GNUMINOR))
# gfortran-4.3
GNUGE43 := $(shell expr $(GNUMAJOR) \>= 4 \& $(GNUMINOR) \>= 3)
GNUGE43 := $(shell expr $(GNUVER) \>= 403)
ifeq "$(GNUGE43)" "1"
FFLAGS += -fbacktrace -fdump-core
# gfortran-4.6
GNUGE46 := $(shell expr $(GNUMINOR) \>= 6)
GNUGE46 := $(shell expr $(GNUVER) \>= 406)
ifeq "$(GNUGE46)" "1"
FFLAGS += -Wno-unused-dummy-argument
# gfortran-4.8
GNUGE48 := $(shell expr $(GNUMINOR) \>= 8)
GNUGE48 := $(shell expr $(GNUVER) \>= 408)
ifeq "$(GNUGE48)" "1"
FFLAGS += -Wno-target-lifetime
endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment