Skip to content

Commit 7b115a9

Browse files
author
Ralph Castain
committed
Patch from Gilles - modify detection of PMIx version for external libraries
1 parent d2abff5 commit 7b115a9

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

config/opal_check_pmi.m4

+7-3
Original file line numberDiff line numberDiff line change
@@ -280,10 +280,12 @@ AC_DEFUN([OPAL_CHECK_PMIX],[
280280
CPPFLAGS=$opal_pmix_ext_CPPFLAGS
281281
LDFLAGS=$opal_pmix_ext_LDFLAGS
282282
LIBS=$opal_pmix_ext_LIBS
283-
LD_LIBRARY_PATH=$pmix_ext_install_dir/lib
283+
LD_LIBRARY_PATH=$pmix_ext_install_dir/lib:$LD_LIBRARY_PATH
284+
export LD_LIBRARY_PATH
284285
285286
AC_MSG_CHECKING([PMIx library version])
286-
AC_TRY_RUN([
287+
AC_RUN_IFELSE([
288+
AC_LANG_SOURCE([
287289
#include <stdio.h>
288290
#include <stdlib.h>
289291
#include <pmix.h>
@@ -302,15 +304,17 @@ int main(int argc, char **argv)
302304
303305
return 0;
304306
}
305-
], [
307+
])], [
306308
eval opal_external_pmix_version=`cat conftestval`
307309
AC_MSG_RESULT([$opal_external_pmix_version])
308310
], [
309311
LD_LIBRARY_PATH=$opal_pmix_LD_LIBRARY_PATH_save
312+
export LD_LIBRARY_PATH
310313
opal_external_pmix_happy="no"
311314
AC_MSG_ERROR([External PMIx support requested but could not build/run a test program. Aborting])
312315
], [
313316
LD_LIBRARY_PATH=$opal_pmix_LD_LIBRARY_PATH_save
317+
export LD_LIBRARY_PATH
314318
opal_external_pmix_happy="no"
315319
AC_MSG_ERROR([External PMIx disabled for cross compile. Aborting])
316320
])

0 commit comments

Comments
 (0)