Changeset e7b1f5b for GNUmakefile

Timestamp:

09/28/18 12:53:22 (6 years ago)

Author:

Hal Finkel <hfinkel@…>

Branches:

master, pympi

Children:

0654f4c

Parents:

b060d3c (diff), be75350 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Hal Finkel <hfinkel@…> (09/28/18 12:53:22)

git-committer:

Hal Finkel <hfinkel@…> (09/28/18 12:53:22)

Message:

Merge branch 'master' of git.mcs.anl.gov:genericio

Conflicts:

GNUmakefile

File:

• GNUmakefile (modified) (1 diff)

GNUmakefile

@@ -63 +63 @@
 BASE_CPPFLAGS := $(BLOSC_CPPFLAGS) -I. -D__STDC_CONSTANT_MACROS
 
+UNAME_S := $(shell uname -s)
+ifeq ($(UNAME_S),Linux)
+    OPENMPFLAG=-fopenmp
+endif
+
 FEDIR = frontend
-FE_CFLAGS := -g -fPIC -O3 -fopenmp -std=gnu99
+FE_CFLAGS := -g -fPIC -O3 $(OPENMPFLAG) -std=gnu99
 FE_CPPFLAGS := $(BASE_CPPFLAGS) -Ithirdparty/sqlite -DGENERICIO_NO_MPI
 
 MPIDIR = mpi
-MPI_CFLAGS := -g -O3 -fopenmp -std=gnu99
+MPI_CFLAGS := -g -O3 $(OPENMPFLAG) -std=gnu99
 MPI_CPPFLAGS := $(BASE_CPPFLAGS)