Merge pull request #4471 from ChipKerchner/fixMakefileAIXOpenMP
Fix Makefiles to support OpenMP on AIX for xlc (clang) with xlf.
This commit is contained in:
commit
a29f91ae9a
|
@ -218,6 +218,9 @@ ifeq ($(F_COMPILER), IBM)
|
||||||
ifeq ($(C_COMPILER), GCC)
|
ifeq ($(C_COMPILER), GCC)
|
||||||
CEXTRALIB += -lgomp
|
CEXTRALIB += -lgomp
|
||||||
endif
|
endif
|
||||||
|
ifeq ($(C_COMPILER), CLANG)
|
||||||
|
CEXTRALIB += -lomp
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -276,6 +276,9 @@ ifeq ($(F_COMPILER), IBM)
|
||||||
ifeq ($(C_COMPILER), GCC)
|
ifeq ($(C_COMPILER), GCC)
|
||||||
CEXTRALIB += -lgomp
|
CEXTRALIB += -lgomp
|
||||||
endif
|
endif
|
||||||
|
ifeq ($(C_COMPILER), CLANG)
|
||||||
|
CEXTRALIB += -lomp
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -45,8 +45,18 @@ endif
|
||||||
|
|
||||||
all : run_test
|
all : run_test
|
||||||
|
|
||||||
|
ifeq ($(OSNAME), AIX)
|
||||||
|
ifeq ($(USE_OPENMP), 1)
|
||||||
|
$(UTESTBIN): $(OBJS)
|
||||||
|
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ ../$(LIBNAME) $(EXTRALIB)
|
||||||
|
else
|
||||||
$(UTESTBIN): $(OBJS)
|
$(UTESTBIN): $(OBJS)
|
||||||
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ ../$(LIBNAME) $(EXTRALIB) $(FEXTRALIB)
|
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ ../$(LIBNAME) $(EXTRALIB) $(FEXTRALIB)
|
||||||
|
endif
|
||||||
|
else
|
||||||
|
$(UTESTBIN): $(OBJS)
|
||||||
|
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ ../$(LIBNAME) $(EXTRALIB) $(FEXTRALIB)
|
||||||
|
endif
|
||||||
|
|
||||||
run_test: $(UTESTBIN)
|
run_test: $(UTESTBIN)
|
||||||
ifneq ($(CROSS), 1)
|
ifneq ($(CROSS), 1)
|
||||||
|
|
Loading…
Reference in New Issue