Merge pull request #1887 from ggouaillardet/topic/configury_fix
configury: fix autogen-sh --no-ompi
Этот коммит содержится в:
Коммит
936967e121
@ -231,6 +231,7 @@ AC_DEFUN([OPAL_SETUP_RUNPATH],[
|
|||||||
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],[
|
||||||
# Output goes into globally-visible $rpath_args. Run this in a
|
# Output goes into globally-visible $rpath_args. Run this in a
|
||||||
# sub-process so that we don't pollute the current process
|
# sub-process so that we don't pollute the current process
|
||||||
# environment.
|
# environment.
|
||||||
@ -268,7 +269,7 @@ EOF
|
|||||||
end program]])],
|
end program]])],
|
||||||
[runpath_fc_args="${wl_fc}--enable-new-dtags"],
|
[runpath_fc_args="${wl_fc}--enable-new-dtags"],
|
||||||
[runpath_fc_args=""])
|
[runpath_fc_args=""])
|
||||||
AC_LANG_POP([Fortran])
|
AC_LANG_POP([Fortran])])
|
||||||
LDFLAGS=$LDFLAGS_save
|
LDFLAGS=$LDFLAGS_save
|
||||||
|
|
||||||
OPAL_VAR_SCOPE_POP
|
OPAL_VAR_SCOPE_POP
|
||||||
@ -303,7 +304,6 @@ AC_DEFUN([RPATHIFY_LDFLAGS],[RPATHIFY_LDFLAGS_INTERNAL([$1], [rpath_args], [runp
|
|||||||
|
|
||||||
AC_DEFUN([RPATHIFY_FC_LDFLAGS],[RPATHIFY_LDFLAGS_INTERNAL([$1], [rpath_fc_args], [runpath_fc_args])])
|
AC_DEFUN([RPATHIFY_FC_LDFLAGS],[RPATHIFY_LDFLAGS_INTERNAL([$1], [rpath_fc_args], [runpath_fc_args])])
|
||||||
|
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
dnl Avoid some repetitive code below
|
dnl Avoid some repetitive code below
|
||||||
dnl
|
dnl
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user