fixed automatic determination of compiler

This commit is contained in:
Martin Diehl 2015-01-16 11:19:30 +00:00
parent 267b9d723d
commit 93e50366bb
1 changed files with 9 additions and 5 deletions

View File

@ -24,10 +24,14 @@ COMPILERNAME ?= $(FC)
LINKERNAME ?= $(FLINKER) LINKERNAME ?= $(FLINKER)
# MPI compiler wrappers will tell if they are pointing to ifort or gfortran # MPI compiler wrappers will tell if they are pointing to ifort or gfortran
COMPILEROUT :=$(shell $(FC) --show) COMPILEROUT :=$(shell $(FC) -show)
# search in FC or COMPILEROUT for gfortran/ifort if not defined # search in FC or COMPILEROUT for gfortran/ifort if not defined
F90 ?=$(findstring ifort,$(FC) $(COMPILEROUT)) ifeq ($(strip $(F90)),)
F90 ?=$(findstring gfortran,$(FC) $(COMPILEROUT)) F90 :=$(findstring gfortran,$(FC) $(COMPILEROUT))
endif
ifeq ($(strip $(F90)),)
F90 :=$(findstring ifort,$(FC) $(COMPILEROUT))
endif
ifeq "$(FASTBUILD)" "YES" ifeq "$(FASTBUILD)" "YES"
OPENMP := OFF OPENMP := OFF
@ -571,7 +575,7 @@ clean:
.PHONY: help .PHONY: help
help: help:
F90=$(F90) F90="$(F90)"
COMPILERNAME=$(COMPILERNAME) COMPILERNAME="$(COMPILERNAME)"
COMPILEROUT="$(COMPILEROUT)" COMPILEROUT="$(COMPILEROUT)"