Merge pull request open-mpi#10334 from bwbarrett/bugfix/oshmem-fortran-wrapper

oshmem/wrappers: Fix oshmem Fortran wrapper

Author: awlauria

config/opal_setup_wrappers.m4

@@ -617,14 +617,6 @@ AC_DEFUN([OPAL_SETUP_WRAPPER_FINAL],[
        AC_SUBST([OMPI_WRAPPER_LDFLAGS_STATIC])
        AC_MSG_RESULT([$OMPI_WRAPPER_LDFLAGS_STATIC])
 
-       AC_MSG_CHECKING([for OMPI wrapper Fortran LDFLAGS])
-       AC_SUBST([OMPI_WRAPPER_LDFLAGS])
-       AC_MSG_RESULT([$OMPI_WRAPPER_LDFLAGS])
-
-       AC_MSG_CHECKING([for OMPI wrapper Fortran static LDFLAGS])
-       AC_SUBST([OMPI_WRAPPER_LDFLAGS_STATIC])
-       AC_MSG_RESULT([$OMPI_WRAPPER_LDFLAGS_STATIC])
-
        AC_MSG_CHECKING([for OMPI wrapper LIBS])
        AC_SUBST([OMPI_WRAPPER_LIBS])
        AC_MSG_RESULT([$OMPI_WRAPPER_LIBS])
@@ -790,7 +782,7 @@ AC_DEFUN([OPAL_SETUP_WRAPPER_FINAL],[
              [dnl deal with some interesting expansion behavior in OPAL_APPEND
               wrapper_tmp_arg="${OMPI_FC_MODULE_FLAG}"'${libdir}'
               OPAL_APPEND([OSHMEM_WRAPPER_FCFLAGS], [${wrapper_tmp_arg}])])
-       AC_SUBST([OSHMEM_WRAPPER_EXTRA_FCFLAGS])
+       AC_SUBST([OSHMEM_WRAPPER_FCFLAGS])
        AC_MSG_RESULT([$OSHMEM_WRAPPER_EXTRA_FCFLAGS])
 
        AC_MSG_CHECKING([for OSHMEM wrapper FCFLAGS_PREFIX])
@@ -863,14 +855,6 @@ AC_DEFUN([OPAL_SETUP_WRAPPER_FINAL],[
        AC_SUBST([OSHMEM_WRAPPER_LDFLAGS_STATIC])
        AC_MSG_RESULT([$OSHMEM_WRAPPER_LDFLAGS_STATIC])
 
-       AC_MSG_CHECKING([for OSHMEM wrapper Fortran LDFLAGS])
-       AC_SUBST([OSHMEM_WRAPPER_LDFLAGS])
-       AC_MSG_RESULT([$OSHMEM_WRAPPER_LDFLAGS])
-
-       AC_MSG_CHECKING([for OSHMEM wrapper Fortran static LDFLAGS])
-       AC_SUBST([OSHMEM_WRAPPER_LDFLAGS_STATIC])
-       AC_MSG_RESULT([$OSHMEM_WRAPPER_LDFLAGS_STATIC])
-
        AC_MSG_CHECKING([for OSHMEM wrapper LIBS])
        AC_SUBST([OSHMEM_WRAPPER_LIBS])
        AC_MSG_RESULT([$OSHMEM_WRAPPER_LIBS])
@@ -879,6 +863,14 @@ AC_DEFUN([OPAL_SETUP_WRAPPER_FINAL],[
        AC_SUBST([OSHMEM_WRAPPER_LIBS_STATIC])
        AC_MSG_RESULT([$OSHMEM_WRAPPER_LIBS_STATIC])
 
+       AC_MSG_CHECKING([for OSHMEM wrapper Fortran LDFLAGS])
+       AC_SUBST([OSHMEM_WRAPPER_FC_LDFLAGS])
+       AC_MSG_RESULT([$OSHMEM_WRAPPER_FC_LDFLAGS])
+
+       AC_MSG_CHECKING([for OSHMEM wrapper Fortran static LDFLAGS])
+       AC_SUBST([OSHMEM_WRAPPER_FC_LDFLAGS_STATIC])
+       AC_MSG_RESULT([$OSHMEM_WRAPPER_FC_LDFLAGS_STATIC])
+
        AC_MSG_CHECKING([for OSHMEM wrapper Fortran LIBS])
        AC_SUBST([OSHMEM_WRAPPER_FC_LIBS])
        AC_MSG_RESULT([$OSHMEM_WRAPPER_FC_LIBS])