From 482f65daa9800589afe987ab391c0227ce3e06a3 Mon Sep 17 00:00:00 2001
From: Evan Ramos <evan@hpccharm.com>
Date: Wed, 3 Apr 2019 22:20:09 -0500
Subject: [PATCH] Clean up mpi.h inclusion on Windows

Change-Id: Id9509211da7bf368a6a9b9f18834bea2fb9f304e
---
 src/arch/mpi-win64/conv-mach.sh | 5 -----
 src/libs/ck-libs/ampi/ampiCC    | 9 +--------
 src/scripts/charmc              | 8 +++++++-
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/arch/mpi-win64/conv-mach.sh b/src/arch/mpi-win64/conv-mach.sh
index 81d7a3d416..060ff9bc5f 100644
--- a/src/arch/mpi-win64/conv-mach.sh
+++ b/src/arch/mpi-win64/conv-mach.sh
@@ -29,14 +29,9 @@ else
 fi
 HPC_SDK=`cygpath -d "$HPC_SDK"`
 
-# These include paths for MS MPI (added through the $INCLUDE variable) have a
-# lower priority than paths added via -I, thus allowing us to use AMPI's mpi.h
-# when compiling AMPI applications.
-export INCLUDE="$INCLUDE;`cygpath -wl "$HPC_SDK\Inc"`;`cygpath -wl "$HPC_SDK\Include"`"
 MSMPI_INCLUDE="-I `cygpath -u "$HPC_SDK\Include"`"
 if test -n "MSMPI_SUFFIX_INC"
 then
-  export INCLUDE="$INCLUDE;`cygpath -wl "$HPC_SDK\Include$MSMPI_SUFFIX_INC"`"
   MSMPI_INCLUDE="-I `cygpath -u "$HPC_SDK\Include$MSMPI_SUFFIX_INC"` $MSMPI_INCLUDE"
 fi
 
diff --git a/src/libs/ck-libs/ampi/ampiCC b/src/libs/ck-libs/ampi/ampiCC
index 3e4cac6218..2944e11505 100755
--- a/src/libs/ck-libs/ampi/ampiCC
+++ b/src/libs/ck-libs/ampi/ampiCC
@@ -42,20 +42,13 @@ done
 
 eval processArgs "$@"
 
-AMPICC_EXTRA_OPTS=''
-
-if test "$AMPICC_MODE" = 'ampi'
-then
-  AMPICC_EXTRA_OPTS="$AMPICC_EXTRA_OPTS -I$CHARMBIN/../include/ampi"
-fi
-
 [ -n "$ROMIO_CONFIGURE" -a -z "$MPITEST" ] && STANDALONE='true'
 
 [ -n "$STANDALONE" ] && ARGS="$ARGS -standalone"
 
 [ -f $CHARMBIN/../lib/libampiromio.a -a -z "$STANDALONE" -a -z "$ROMIO_CONFIGURE" ] && ROMIO='-lampiromio'
 
-$CHARMBIN/charmc -language $AMPICC_MODE -default-to-aout $AMPICC_EXTRA_OPTS $ARGS $ROMIO
+$CHARMBIN/charmc -language $AMPICC_MODE -default-to-aout $ARGS $ROMIO
 status=$?
 
 # Copy ampirun, but do not overwrite it if it already exists.
diff --git a/src/scripts/charmc b/src/scripts/charmc
index f93bddce18..54771c2807 100755
--- a/src/scripts/charmc
+++ b/src/scripts/charmc
@@ -66,6 +66,7 @@ USE_F90_LIBRARIES="0"
 USE_F77_LIBRARIES="0"  
 F90_MODDIR=
 AMPIMAIN=""
+AMPI=""
 AMPIF=""
 COPYTO=""        
 MODCOPIES=""        
@@ -440,7 +441,7 @@ do
 	"-language")
 		# Parse out some fake languages (that are actually modules)
 		case "$1" in
-		"ampi") AddModules tcharmmain ampi ;;
+		"ampi") AddModules tcharmmain ampi ; AMPI="1" ;;
 		"ampif") AddModules tcharmmain ampif ; USE_F90_LIBRARIES="1" ; AMPIF="1" ;;
 		"armci") AddModules tcharmmain armci ;;
 		"armcif") AddModules tcharmmain armci ; USE_F90_LIBRARIES="1" ;;
@@ -1378,6 +1379,11 @@ then
 	OBJECTFILES="$CHARMLIB/lib$AMPIMAIN.o $OBJECTFILES"
 fi
 
+if [ -n "$AMPI" ]
+then
+  CMK_SYSINC="-I$CHARMINC/ampi $CMK_SYSINC"
+fi
+
 if [ "$TLSGLOBALS" = "1" ]
 then
     if [ "$CMK_GDIR" = "uth" ]
-- 
2.11.4.GIT