|
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. |
21 | 20 | * $COPYRIGHT$
|
22 | 21 | *
|
23 | 22 | * Additional copyrights may follow
|
@@ -345,7 +344,6 @@ static int setup_launch(int *argcptr, char ***argvptr,
|
345 | 344 | bool found;
|
346 | 345 | char *lib_base=NULL, *bin_base=NULL;
|
347 | 346 | char *opal_prefix = getenv("OPAL_PREFIX");
|
348 |
| - char *pmix_prefix = getenv("PMIX_INSTALL_PREFIX"); |
349 | 347 | char* full_orted_cmd = NULL;
|
350 | 348 |
|
351 | 349 | /* Figure out the basenames for the libdir and bindir. This
|
@@ -499,16 +497,13 @@ static int setup_launch(int *argcptr, char ***argvptr,
|
499 | 497 | * we have to insert the orted_prefix in the right place
|
500 | 498 | */
|
501 | 499 | (void)asprintf (&final_cmd,
|
502 |
| - "%s%s%s %s%s%s PATH=%s%s$PATH ; export PATH ; " |
| 500 | + "%s%s%s PATH=%s%s$PATH ; export PATH ; " |
503 | 501 | "LD_LIBRARY_PATH=%s%s$LD_LIBRARY_PATH ; export LD_LIBRARY_PATH ; "
|
504 | 502 | "DYLD_LIBRARY_PATH=%s%s$DYLD_LIBRARY_PATH ; export DYLD_LIBRARY_PATH ; "
|
505 | 503 | "%s %s",
|
506 | 504 | (opal_prefix != NULL ? "OPAL_PREFIX=" : " "),
|
507 | 505 | (opal_prefix != NULL ? opal_prefix : " "),
|
508 | 506 | (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;" : " "), |
512 | 507 | (NULL != bin_base ? bin_base : " "),
|
513 | 508 | (NULL != bin_base ? ":" : " "),
|
514 | 509 | (NULL != lib_base ? lib_base : " "),
|
|
0 commit comments