diff --git a/Makefile.system b/Makefile.system index b63c7799d..7ba45f2e1 100644 --- a/Makefile.system +++ b/Makefile.system @@ -872,8 +872,14 @@ override FPFLAGS += $(COMMON_OPT) $(FCOMMON_OPT) $(COMMON_PROF) #MAKEOVERRIDES = #For LAPACK Fortran codes. +#Disable -fopenmp for LAPACK Fortran codes on Windows. +ifdef OS_WINDOWS LAPACK_FFLAGS := $(filter-out -fopenmp -mp -openmp -xopenmp=parallel,$(FFLAGS)) LAPACK_FPFLAGS := $(filter-out -fopenmp -mp -openmp -xopenmp=parallel,$(FPFLAGS)) +else +LAPACK_FFLAGS := $(FFLAGS) +LAPACK_FPFLAGS := $(FPFLAGS) +endif LAPACK_CFLAGS = $(CFLAGS) LAPACK_CFLAGS += -DHAVE_LAPACK_CONFIG_H