Fixing GCC in the make files for NREL machines.

kaiserpeng · Apr 7, 2017 · 384b18d · 384b18d
1 parent c9064cb
commit 384b18d
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/Tools/GNUMake/sites/Make.nrel b/Tools/GNUMake/sites/Make.nrel
@@ -2,12 +2,17 @@ ifneq ($(which_computer),$(filter $(which_computer),merlin anymachine))
   $(error Unknown NREL computer, $(which_computer))
 endif
 
-ifeq ($(COMP), intel)
-  ifeq ($(USE_MPI), TRUE)
+ifeq ($(USE_MPI), TRUE)
+  ifeq ($(COMP), intel)
     CXX := mpiicpc
     CC  := mpiicc
     FC  := mpiifort
     fC  := mpiifort
     F90 := mpiifort
+  else
+    CXX := mpicxx
+    CC  := mpicc
+    FC  := mpif90
+    F90 := mpif90
   endif
 endif