From 4f5691e5c00e906d66b0eeb3d90c87f618d41c6d Mon Sep 17 00:00:00 2001 From: Thomas Anderson Date: Fri, 12 Jun 2015 23:52:07 -0700 Subject: [PATCH] Fix test execution when USE_OPENMP=0 The standard way to disable OpenMP support is to set USE_OPENMP=0, as indicated by other checks to see if USE_OPENMP equals 1. The problem is obviously then that `ifdef USE_OPENMP` is very much not what we want to test for. This causes tests to fail when no OpenMP library is installed. --- Makefile.system | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile.system b/Makefile.system index 628e6fb55..5c3910989 100644 --- a/Makefile.system +++ b/Makefile.system @@ -591,7 +591,7 @@ else FCOMMON_OPT += -m32 endif endif -ifdef USE_OPENMP +ifeq ($(USE_OPENMP), 1) FCOMMON_OPT += -fopenmp endif endif @@ -603,14 +603,14 @@ ifneq ($(INTERFACE64), 0) FCOMMON_OPT += -i8 endif endif -ifdef USE_OPENMP +ifeq ($(USE_OPENMP), 1) FCOMMON_OPT += -openmp endif endif ifeq ($(F_COMPILER), FUJITSU) CCOMMON_OPT += -DF_INTERFACE_FUJITSU -ifdef USE_OPENMP +ifeq ($(USE_OPENMP), 1) FCOMMON_OPT += -openmp endif endif @@ -628,7 +628,7 @@ endif else FCOMMON_OPT += -q32 endif -ifdef USE_OPENMP +ifeq ($(USE_OPENMP), 1) FCOMMON_OPT += -openmp endif endif @@ -646,7 +646,7 @@ FCOMMON_OPT += -tp p7-64 else FCOMMON_OPT += -tp p7 endif -ifdef USE_OPENMP +ifeq ($(USE_OPENMP), 1) FCOMMON_OPT += -mp endif endif @@ -675,7 +675,7 @@ FCOMMON_OPT += -mabi=n32 endif endif -ifdef USE_OPENMP +ifeq ($(USE_OPENMP), 1) FCOMMON_OPT += -mp endif endif @@ -712,7 +712,7 @@ FCOMMON_OPT += -m64 endif endif -ifdef USE_OPENMP +ifeq ($(USE_OPENMP), 1) FEXTRALIB += -lstdc++ FCOMMON_OPT += -mp endif @@ -760,14 +760,14 @@ FCOMMON_OPT += -m32 else FCOMMON_OPT += -m64 endif -ifdef USE_OPENMP +ifeq ($(USE_OPENMP), 1) FCOMMON_OPT += -xopenmp=parallel endif endif ifeq ($(F_COMPILER), COMPAQ) CCOMMON_OPT += -DF_INTERFACE_COMPAQ -ifdef USE_OPENMP +ifeq ($(USE_OPENMP), 1) FCOMMON_OPT += -openmp endif endif