Skip to content

Topic/fix 6539 v4.0.x #7338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 26, 2020
Merged

Topic/fix 6539 v4.0.x #7338

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d12e0fd
make mpifort obey disable-wrapper-runpath
hppritcha Jan 2, 2020
2975055
Fix a problem with fortran configure test.
hppritcha Jan 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions config/opal_setup_wrappers.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 and Technology (RIST). 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
dnl Additional copyrights may follow
Expand Down Expand Up @@ -216,6 +218,7 @@ AC_DEFUN([OPAL_SETUP_RUNPATH],[

# Set the output in $runpath_args
runpath_args=
runpath_fc_args=
LDFLAGS_save=$LDFLAGS
LDFLAGS="$LDFLAGS -Wl,--enable-new-dtags"
AS_IF([test x"$enable_wrapper_runpath" = x"yes"],
Expand All @@ -226,17 +229,18 @@ AC_DEFUN([OPAL_SETUP_RUNPATH],[
runpath_args="-Wl,--enable-new-dtags"
AC_MSG_RESULT([yes (-Wl,--enable-new-dtags)])],
[AC_MSG_RESULT([no])])
AC_LANG_POP([C])])
m4_ifdef([project_ompi],[
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
AC_LANG_POP([C])
m4_ifdef([project_ompi],
[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"],
[runpath_fc_args=""])
AC_LANG_POP([Fortran])])
[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

OPAL_VAR_SCOPE_POP
Expand Down