ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

make mpifort obey disable-wrapper-runpath

Просмотр исходного кода 
related to #6539

Signed-off-by: Howard Pritchard <howardp@lanl.gov>
(cherry picked from commit 37b3e2f3fa)
Этот коммит содержится в:
Howard Pritchard 2020-01-02 09:06:10 -07:00
родитель 93c879962e
Коммит d12e0fdf32
1 изменённых файлов: 13 добавлений и 10 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

23
config/opal_setup_wrappers.m4
Просмотреть файл

@ -15,6 +15,8 @@ dnl Copyright (c) 2009-2016 Cisco Systems, Inc. All rights reserved.
dnl Copyright (c) 2015-2017 Research Organization for Information Science dnl Copyright (c) 2015-2017 Research Organization for Information Science
dnl and Technology (RIST). All rights reserved. dnl and Technology (RIST). All rights reserved.
dnl Copyright (c) 2016 IBM Corporation. All rights reserved. dnl Copyright (c) 2016 IBM Corporation. All rights reserved.
dnl Copyright (c) 2020 Triad National Security, LLC. All rights
dnl reserved.
dnl $COPYRIGHT$ dnl $COPYRIGHT$
dnl dnl
dnl Additional copyrights may follow dnl Additional copyrights may follow
@ -216,6 +218,7 @@ AC_DEFUN([OPAL_SETUP_RUNPATH],[
# Set the output in $runpath_args # Set the output in $runpath_args
runpath_args= runpath_args=
runpath_fc_args=
LDFLAGS_save=$LDFLAGS LDFLAGS_save=$LDFLAGS
LDFLAGS="$LDFLAGS -Wl,--enable-new-dtags" LDFLAGS="$LDFLAGS -Wl,--enable-new-dtags"
AS_IF([test x"$enable_wrapper_runpath" = x"yes"], AS_IF([test x"$enable_wrapper_runpath" = x"yes"],
@ -226,17 +229,17 @@ AC_DEFUN([OPAL_SETUP_RUNPATH],[
runpath_args="-Wl,--enable-new-dtags" runpath_args="-Wl,--enable-new-dtags"
AC_MSG_RESULT([yes (-Wl,--enable-new-dtags)])], AC_MSG_RESULT([yes (-Wl,--enable-new-dtags)])],
[AC_MSG_RESULT([no])]) [AC_MSG_RESULT([no])])
AC_LANG_POP([C])]) AC_LANG_POP([C])
m4_ifdef([project_ompi],[ m4_ifdef([project_ompi],
OPAL_LIBTOOL_CONFIG([wl],[wl_fc],[--tag=FC],[]) [OPAL_LIBTOOL_CONFIG([wl],[wl_fc],[--tag=FC],[])
LDFLAGS="$LDFLAGS_save ${wl_fc}--enable-new-dtags"
AC_LANG_PUSH([Fortran])
AC_LINK_IFELSE([AC_LANG_SOURCE([[program test end program]])],
[runpath_fc_args="${wl_fc}--enable-new-dtags"
AC_MSG_RESULT([yes (-Wl,--enable-new-dtags)])],
[AC_MSG_RESULT([no])])
AC_LANG_POP([Fortran])])])
LDFLAGS="$LDFLAGS_save ${wl_fc}--enable-new-dtags"
AC_LANG_PUSH([Fortran])
AC_LINK_IFELSE([AC_LANG_SOURCE([[program test
end program]])],
[runpath_fc_args="${wl_fc}--enable-new-dtags"],
[runpath_fc_args=""])
AC_LANG_POP([Fortran])])
LDFLAGS=$LDFLAGS_save LDFLAGS=$LDFLAGS_save
OPAL_VAR_SCOPE_POP OPAL_VAR_SCOPE_POP