Merge remote-tracking branch 'upstream/master' into 32bit-dim_t

This commit is contained in:
Devin Matthews
2016-07-22 13:45:23 -05:00

View File

@@ -170,8 +170,8 @@ ifeq ($(THREADING_MODEL),auto)
THREADING_MODEL := omp
endif
ifeq ($(THREADING_MODEL),omp)
CTHREADFLAGS := -openmp
LDFLAGS += -openmp
CTHREADFLAGS := -fopenmp
LDFLAGS += -fopenmp
endif
ifeq ($(THREADING_MODEL),pthreads)
CTHREADFLAGS := -pthread