*** inst-develop-gnu-hsw/bin/upcxx      Sat Dec  7 22:28:55 2019
--- inst-streamline2-gnu-hsw/bin/upcxx  Sun Dec  8 03:10:47 2019
***************
*** 2,4 ****
  export UPCXX_META
! exec "/global/u1/b/bonachea/UPC/upcxx/inst-develop-gnu-hsw/bin/upcxx.sh" "$@"
--- 2,4 ----
  export UPCXX_META
! source "/global/u1/b/bonachea/UPC/upcxx/inst-streamline2-gnu-hsw/bin/upcxx.sh" "$@"
diff -C3 -r inst-develop-gnu-hsw/bin/upcxx-meta inst-streamline2-gnu-hsw/bin/upcxx-meta
*** inst-develop-gnu-hsw/bin/upcxx-meta Sat Dec  7 22:28:55 2019
--- inst-streamline2-gnu-hsw/bin/upcxx-meta     Sun Dec  8 03:10:47 2019
***************
*** 15,21 ****
    echo " "
  fi 1>&2

! PARAMS="CPPFLAGS PPFLAGS CXXFLAGS LIBS LIBFLAGS LDFLAGS CXX CC GASNET_CONDUIT GASNET_INSTALL"
  FAIL=true
  for P in $PARAMS; do
      if [[ "$1" == "$P" ]]; then
--- 15,21 ----
    echo " "
  fi 1>&2

! PARAMS="CPPFLAGS PPFLAGS CXXFLAGS LIBS LIBFLAGS LDFLAGS CXX CC GASNET_CONDUIT GASNET_INSTALL SET DUMP"
  FAIL=true
  for P in $PARAMS; do
      if [[ "$1" == "$P" ]]; then
***************
*** 71,74 ****
    ;;
  esac

! /global/u1/b/bonachea/UPC/upcxx/inst-develop-gnu-hsw/upcxx.${UPCXX_CODEMODE}.${UPCXX_BACKEND}.${UPCXX_NETWORK}/bin/upcxx-meta $*
--- 71,89 ----
    ;;
  esac

! meta="/global/u1/b/bonachea/UPC/upcxx/inst-streamline2-gnu-hsw/upcxx.${UPCXX_CODEMODE}.${UPCXX_BACKEND}.${UPCXX_NETWORK}/bin/upcxx-meta"
!
! if [[ "$1" == "SET" ]] ; then
!   source "$meta" ""
! elif [[ "$1" == "DUMP" ]] ; then
!   # this opens and dumps the variables from the subordinate upcxx-meta
!   # do NOT add any subshells or process forks here, as this branch is motivated by performance
!   i=0
!   while read line; do
!     [ $((i++)) == 0 ] && continue # omit she-bang
!     [ "$line" == "" ] && break    # empty line signals end
!     echo "$line"
!   done < "$meta"
! else
!   exec "$meta" $*
! fi
diff -C3 -r inst-develop-gnu-hsw/bin/upcxx.sh inst-streamline2-gnu-hsw/bin/upcxx.sh
*** inst-develop-gnu-hsw/bin/upcxx.sh   Sat Dec  7 22:28:55 2019
--- inst-streamline2-gnu-hsw/bin/upcxx.sh       Sun Dec  8 03:10:47 2019
***************
*** 13,20 ****
  }

  function set_upcxx_var {
!   local var=UPCXX_`echo "$1" | awk '{ print toupper($0) }'`
!   local val=`echo "$2" | awk '{ print tolower($0) }'`
    # per-var processing
    case $var in
      UPCXX_CODEMODE)
--- 13,28 ----
  }

  function set_upcxx_var {
!   local var="UPCXX_$1"
!   local val="$2"
!   if [[ ${BASH_VERSINFO[0]} -ge 4 ]] ; then
!     # use case modification operators when avail, for efficiency
!     var="${var^^}"
!     val="${val,,}"
!   else # legacy bash (eg macOS), fork additional processes
!     var=`echo "$var" | awk '{ print toupper($0) }'`
!     val=`echo "$val" | awk '{ print tolower($0) }'`
!   fi
    # per-var processing
    case $var in
      UPCXX_CODEMODE)
***************
*** 31,39 ****
  }

  if ! test -x "$UPCXX_META" ; then
!   error UPCXX_META not found
  fi
! prefix="`dirname $UPCXX_META`/.."
  if ! test -d "$prefix" ; then
    error install prefix $prefix not found
  fi
--- 39,47 ----
  }

  if ! test -x "$UPCXX_META" ; then
!   error UPCXX_META=$UPCXX_META not found
  fi
! prefix="${UPCXX_META%/*/*}" # strip the last two components in the path
  if ! test -d "$prefix" ; then
    error install prefix $prefix not found
  fi
***************
*** 56,70 ****
    arg="${@:i:1}"
    case $arg in
      +(-)network=*|+(-)threadmode=*|+(-)codemode=*)
!       var=`echo "$arg" | cut -d= -f1 | awk -F- '{print $NF}'`
!       val=`echo "$arg" | cut -d= -f2-`
        eval set_upcxx_var "$var" "$val"
        # swallow current arg
        set -- "${@:1:i-1}" "${@:i+1}"
        i=$((i-1))
      ;;
      +(-)network|+(-)threadmode|+(-)codemode)
!       var=`echo "$arg" | awk -F- '{print $NF}'`
        val="${@:i+1:1}"
        eval set_upcxx_var "$var" "$val"
        # swallow current and next arg
--- 64,79 ----
    arg="${@:i:1}"
    case $arg in
      +(-)network=*|+(-)threadmode=*|+(-)codemode=*)
!       var="${arg%%=*}"
!       var="${var##+(-)}"
!       val="${arg#*=}"
        eval set_upcxx_var "$var" "$val"
        # swallow current arg
        set -- "${@:1:i-1}" "${@:i+1}"
        i=$((i-1))
      ;;
      +(-)network|+(-)threadmode|+(-)codemode)
!       var="${arg##+(-)}"
        val="${@:i+1:1}"
        eval set_upcxx_var "$var" "$val"
        # swallow current and next arg
***************
*** 72,78 ****
        i=$((i-1))
      ;;
      -Wc,*) # -Wc,anything : anything is passed-thru uninterpreted
!       val=`echo "$arg" | cut -d, -f2-`
        set -- "${@:1:i-1}" "$val" "${@:i+1}"
      ;;
      -E|-c|-S) dolink='' ;;
--- 81,87 ----
        i=$((i-1))
      ;;
      -Wc,*) # -Wc,anything : anything is passed-thru uninterpreted
!       val="${arg#*,}"
        set -- "${@:1:i-1}" "$val" "${@:i+1}"
      ;;
      -E|-c|-S) dolink='' ;;
***************
*** 117,130 ****
    eval verbose $var=\$$var
  done

  for var in CC CXX CXXFLAGS CPPFLAGS LDFLAGS LIBS ; do
!   val=`$UPCXX_META $var`
!   eval $var=\$val
!   verbose "$UPCXX_META $var: $val"
!   if [[ -z "$CC" ]] ; then
!     error "upcxx-meta failed."
!   fi
  done
  EXTRAFLAGS=""
  if [[ $dohelp ]] ; then
    cat<<EOF
--- 126,137 ----
    eval verbose $var=\$$var
  done

+ source $UPCXX_META SET
+ [[ -z "$CC" ]] && error "failure in UPCXX_META=$UPCXX_META"
  for var in CC CXX CXXFLAGS CPPFLAGS LDFLAGS LIBS ; do
!   eval verbose "$var: \$$var"
  done
+
  EXTRAFLAGS=""
  if [[ $dohelp ]] ; then
    cat<<EOF