From cb45dd74d0172d900069ed9d21802ad6d3344ca0 Mon Sep 17 00:00:00 2001
From: Jan Eitzinger <unrz254@cshpc.rrze.uni-erlangen.de>
Date: Wed, 13 Mar 2019 16:24:59 +0100
Subject: [PATCH] Make OpenMP support a config option

---
 Makefile         | 4 +---
 config.mk        | 5 +++++
 include_CLANG.mk | 5 ++++-
 include_GCC.mk   | 9 ++++++---
 include_ICC.mk   | 9 ++++++---
 5 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index dacc79c..14d3e8f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,3 @@
-# Supported: GCC, CLANG, ICC
-TAG ?= GCC
 
 #CONFIGURE BUILD SYSTEM
 TARGET	   = bwbench-$(TAG)
@@ -9,8 +7,8 @@ MAKE_DIR   = ./
 Q         ?= @
 
 #DO NOT EDIT BELOW
-include $(MAKE_DIR)/include_$(TAG).mk
 include $(MAKE_DIR)/config.mk
+include $(MAKE_DIR)/include_$(TAG).mk
 INCLUDES  += -I./src/includes
 
 VPATH     = $(SRC_DIR)
diff --git a/config.mk b/config.mk
index da8c763..9e76b69 100644
--- a/config.mk
+++ b/config.mk
@@ -1,3 +1,8 @@
+# Supported: GCC, CLANG, ICC
+TAG ?= GCC
+ENABLE_OPENMP = false
+
+#Feature options
 OPTIONS  =  -DSIZE=40000000ull
 OPTIONS +=  -DNTIMES=10
 OPTIONS +=  -DARRAY_ALIGNMENT=64
diff --git a/include_CLANG.mk b/include_CLANG.mk
index 0594f80..0034ed6 100644
--- a/include_CLANG.mk
+++ b/include_CLANG.mk
@@ -1,7 +1,10 @@
 CC  = clang
 LINKER = $(CC)
 
-OPENMP   = #-fopenmp
+ifeq ($(ENABLE_OPENMP),true)
+OPENMP   = -fopenmp
+endif
+
 CFLAGS   = -Ofast -std=c99 -pthread $(OPENMP)
 LFLAGS   = -pthread $(OPENMP)
 DEFINES  = -D_GNU_SOURCE
diff --git a/include_GCC.mk b/include_GCC.mk
index 9b964b5..f854058 100644
--- a/include_GCC.mk
+++ b/include_GCC.mk
@@ -1,9 +1,12 @@
 CC  = gcc
 LINKER = $(CC)
 
-OPENMP   = # -fopenmp
-CFLAGS   = -Ofast -std=c11 -pthread $(OPENMP)
+ifeq ($(ENABLE_OPENMP),true)
+OPENMP   = -fopenmp
+endif
+
+CFLAGS   = -Ofast -std=c99 -pthread $(OPENMP)
 LFLAGS   = -pthread $(OPENMP)
 DEFINES  = -D_GNU_SOURCE
 INCLUDES =
-LIBS     = -lpthread
+LIBS     =
diff --git a/include_ICC.mk b/include_ICC.mk
index f35c1ba..436c92e 100644
--- a/include_ICC.mk
+++ b/include_ICC.mk
@@ -1,9 +1,12 @@
 CC  = icc
 LINKER = $(CC)
 
-OPENMP   = #-qopenmp
-CFLAGS   = -Ofast -xhost -std=c11 -pthread $(OPENMP)
+ifeq ($(ENABLE_OPENMP),true)
+OPENMP   = -qopenmp
+endif
+
+CFLAGS   = -Ofast -xhost -std=c99 -pthread $(OPENMP)
 LFLAGS   = -pthread $(OPENMP)
 DEFINES  = -D_GNU_SOURCE
 INCLUDES =
-LIBS     = -lpthread
+LIBS     =