|
17 | 17 | * Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
|
18 | 18 | * Copyright (c) 2015-2017 Research Organization for Information Science
|
19 | 19 | * and Technology (RIST). All rights reserved.
|
| 20 | + * Copyright (c) 2017 Mellanox Technologies, Inc. All rights reserved. |
20 | 21 | * $COPYRIGHT$
|
21 | 22 | *
|
22 | 23 | * Additional copyrights may follow
|
@@ -344,6 +345,7 @@ static int setup_launch(int *argcptr, char ***argvptr,
|
344 | 345 | bool found;
|
345 | 346 | char *lib_base=NULL, *bin_base=NULL;
|
346 | 347 | char *opal_prefix = getenv("OPAL_PREFIX");
|
| 348 | + char *pmix_prefix = getenv("PMIX_INSTALL_PREFIX"); |
347 | 349 | char* full_orted_cmd = NULL;
|
348 | 350 |
|
349 | 351 | /* Figure out the basenames for the libdir and bindir. This
|
@@ -497,13 +499,16 @@ static int setup_launch(int *argcptr, char ***argvptr,
|
497 | 499 | * we have to insert the orted_prefix in the right place
|
498 | 500 | */
|
499 | 501 | (void)asprintf (&final_cmd,
|
500 |
| - "%s%s%s PATH=%s%s$PATH ; export PATH ; " |
| 502 | + "%s%s%s %s%s%s PATH=%s%s$PATH ; export PATH ; " |
501 | 503 | "LD_LIBRARY_PATH=%s%s$LD_LIBRARY_PATH ; export LD_LIBRARY_PATH ; "
|
502 | 504 | "DYLD_LIBRARY_PATH=%s%s$DYLD_LIBRARY_PATH ; export DYLD_LIBRARY_PATH ; "
|
503 | 505 | "%s %s",
|
504 | 506 | (opal_prefix != NULL ? "OPAL_PREFIX=" : " "),
|
505 | 507 | (opal_prefix != NULL ? opal_prefix : " "),
|
506 | 508 | (opal_prefix != NULL ? " ; export OPAL_PREFIX;" : " "),
|
| 509 | + (pmix_prefix != NULL ? "PMIX_INSTALL_PREFIX=" : " "), |
| 510 | + (pmix_prefix != NULL ? pmix_prefix : " "), |
| 511 | + (pmix_prefix != NULL ? " ; export PMIX_INSTALL_PREFIX;" : " "), |
507 | 512 | (NULL != bin_base ? bin_base : " "),
|
508 | 513 | (NULL != bin_base ? ":" : " "),
|
509 | 514 | (NULL != lib_base ? lib_base : " "),
|
|
0 commit comments