AMPI: Clean up ROMIO configure step parameters (#3468)

* charmc: Unset variables mpicc might pick up

Author: evan-charmworks

src/libs/ck-libs/ampi/CMakeLists.txt

@@ -367,20 +367,31 @@ if(CMK_AMPI_WITH_ROMIO)
     ExternalProject_Add(romio
         URL ${CMAKE_CURRENT_SOURCE_DIR}/romio
         CONFIGURE_COMMAND cd ${romio_dir} &&
-            export MPI_IMPL=ampi &&
-            export FROM_MPICH=no &&
-            export FROM_MPICH2=no &&
-            export FROM_LAM=no &&
-            export F77=${CMAKE_BINARY_DIR}/bin/ampif90 &&
-            export CC=${CMAKE_BINARY_DIR}/bin/ampicc &&
             ./configure
             --disable-aio
             --enable-f77=${romio_f77}
             --enable-static=yes
             --enable-shared=no
             --disable-weak-symbols
+            MPI_IMPL=ampi
+            FROM_MPICH=no
+            FROM_LAM=no
+            FROM_OMPI=no
+            MPI_LIB=
+            CC=${CMAKE_BINARY_DIR}/bin/ampicc
+            F77=${CMAKE_BINARY_DIR}/bin/ampif77
+            FC=${CMAKE_BINARY_DIR}/bin/ampif90
             CFLAGS=${ROMIO_FLAGS}
             FFLAGS=${ROMIO_FLAGS}
+            FCFLAGS=${ROMIO_FLAGS}
+            CPP=
+            CPPFLAGS=
+            LIBS=
+            LDFLAGS=
+            TEST_CC=${CMAKE_BINARY_DIR}/bin/ampicc
+            TEST_F77=${CMAKE_BINARY_DIR}/bin/ampif77
+            USER_CFLAGS=${ROMIO_FLAGS}
+            USER_FFLAGS=${ROMIO_FLAGS}
             > /dev/null
         COMMAND cp -f ${romio_dir}/include/mpio.h ${CMAKE_BINARY_DIR}/include/
         COMMAND cp -f ${romio_dir}/include/mpiof.h ${CMAKE_BINARY_DIR}/include/

src/libs/ck-libs/ampi/Makefile

@@ -112,20 +112,33 @@ all: $(MAJOR_TARGETS) $(COMPATLIB) $(ROMIO)
 
 $(ROMIO): headers
 	@echo "Building ROMIO"
-	cd romio &&                                                                  \
-		MPI_IMPL="ampi" FROM_MPICH="no" FROM_LAM="no" FROM_OMPI="no"         \
-		MPI_LIB=""                                                           \
-		CFLAGS="$(OPTS) $(ROMIO_FLAGS)"        \
-		FFLAGS="$(OPTS) $(ROMIO_FLAGS)"        \
-		F77="$(CDIR)/bin/ampif90"                                            \
-		CC="$(CDIR)/bin/ampicc"                                              \
-		./configure                                                          \
-		--disable-aio                                                        \
-		--enable-f77=$(ROMIO_F77)                                            \
-		--enable-static=yes                                                  \
-		--enable-shared=no                                                   \
-		--disable-weak-symbols                                               \
-		--srcdir=`pwd`                                                       \
+	cd romio && \
+		./configure \
+		--disable-aio \
+		--enable-f77=$(ROMIO_F77) \
+		--enable-static=yes \
+		--enable-shared=no \
+		--disable-weak-symbols \
+		--srcdir="$(pwd)" \
+		MPI_IMPL=ampi \
+		FROM_MPICH=no \
+		FROM_LAM=no \
+		FROM_OMPI=no \
+		MPI_LIB= \
+		CC="$(CDIR)/bin/ampicc" \
+		F77="$(CDIR)/bin/ampif77" \
+		FC="$(CDIR)/bin/ampif90" \
+		CFLAGS="$(OPTS) $(ROMIO_FLAGS)" \
+		FFLAGS="$(OPTS) $(ROMIO_FLAGS)" \
+		FCFLAGS="$(OPTS) $(ROMIO_FLAGS)" \
+		CPP= \
+		CPPFLAGS= \
+		LIBS= \
+		LDFLAGS= \
+		TEST_CC="$(CDIR)/bin/ampicc" \
+		TEST_F77="$(CDIR)/bin/ampif77" \
+		USER_CFLAGS="$(OPTS) $(ROMIO_FLAGS)" \
+		USER_FFLAGS="$(OPTS) $(ROMIO_FLAGS)" \
 		|| ( cat config.log ; exit 1 )
 
 	cp romio/include/mpio.h romio/include/mpiof.h romio/include/mpio_functions.h $(CDIR)/include

src/scripts/charmc

@@ -17,6 +17,21 @@ if [ "$1" = "@CMAKE_C_COMPILER@" ]; then shift; fi
 if [ "$1" = "@CMAKE_CXX_COMPILER@" ]; then shift; fi
 if [ "$1" = "@CMAKE_Fortran_COMPILER@" ]; then shift; fi
 
+# Avoid mpicc using these variables, particularly during configure phases.
+unset -v CC
+unset -v CXX
+unset -v F77
+unset -v FC
+unset -v CFLAGS
+unset -v CXXFLAGS
+unset -v FFLAGS
+unset -v FCFLAGS
+unset -v CPP
+unset -v CXXCPP
+unset -v CPPFLAGS
+unset -v LIBS
+unset -v LDFLAGS
+
 #Prepare aliases for the external commands we use--
 # Note that adding /bin/ to everything breaks Cygwin32.
 RM="rm -f"