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

opal_check_pmi.m4: properly save top-level flags

Просмотр исходного кода 
CPPFLAGS, LDFLAGS, and LIBS were only being saved conditionally, but
restored unconditionally.  This could result in wiping out
CPPFLAGS/LDFLAGS/LIB.

Make sure to *always* save these flags so that when they are restored,
they are restored to their proper value.

Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
Этот коммит содержится в:
Jeff Squyres 2020-03-17 22:13:09 -04:00
родитель b35d714131
Коммит cb1e424359
1 изменённых файлов: 5 добавлений и 5 удалений

10
config/opal_check_pmi.m4

@ -10,7 +10,7 @@
# University of Stuttgart. All rights reserved. # University of Stuttgart. All rights reserved.
# Copyright (c) 2004-2005 The Regents of the University of California. # Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved. # All rights reserved.
# Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2009-2019 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2011-2014 Los Alamos National Security, LLC. All rights # Copyright (c) 2011-2014 Los Alamos National Security, LLC. All rights
# reserved. # reserved.
# Copyright (c) 2014-2019 Intel, Inc. All rights reserved. # Copyright (c) 2014-2019 Intel, Inc. All rights reserved.
@ -36,6 +36,10 @@ AC_DEFUN([OPAL_CHECK_PMIX_LIB],[
OPAL_VAR_SCOPE_PUSH([opal_external_pmix_save_CPPFLAGS opal_external_pmix_save_LDFLAGS opal_external_pmix_save_LIBS]) OPAL_VAR_SCOPE_PUSH([opal_external_pmix_save_CPPFLAGS opal_external_pmix_save_LDFLAGS opal_external_pmix_save_LIBS])
opal_external_pmix_happy=no opal_external_pmix_happy=no
opal_external_pmix_save_CPPFLAGS=$CPPFLAGS
opal_external_pmix_save_LDFLAGS=$LDFLAGS
opal_external_pmix_save_LIBS=$LIBS
# Make sure we have the headers and libs in the correct location # Make sure we have the headers and libs in the correct location
AC_MSG_CHECKING([for pmix.h in $1]) AC_MSG_CHECKING([for pmix.h in $1])
files=`ls $1/pmix.h 2> /dev/null | wc -l` files=`ls $1/pmix.h 2> /dev/null | wc -l`
@ -91,10 +95,6 @@ AC_DEFUN([OPAL_CHECK_PMIX_LIB],[
AC_MSG_ERROR([Cannot continue])])])]) AC_MSG_ERROR([Cannot continue])])])])
# check the version # check the version
opal_external_pmix_save_CPPFLAGS=$CPPFLAGS
opal_external_pmix_save_LDFLAGS=$LDFLAGS
opal_external_pmix_save_LIBS=$LIBS
# if the pmix_version.h file does not exist, then # if the pmix_version.h file does not exist, then
# this must be from a pre-1.1.5 version OMPI does # this must be from a pre-1.1.5 version OMPI does
# NOT support anything older than v1.2.5 # NOT support anything older than v1.2.5