|
61 | 61 | #include "opal/mca/btl/base/base.h"
|
62 | 62 | #include "opal/mca/pmix/pmix.h"
|
63 | 63 | #include "opal/util/timings.h"
|
| 64 | +#include "opal/util/opal_environ.h" |
64 | 65 |
|
65 | 66 | #include "ompi/constants.h"
|
66 | 67 | #include "ompi/mpi/fortran/base/constants.h"
|
@@ -378,7 +379,6 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided)
|
378 | 379 | ompi_proc_t** procs;
|
379 | 380 | size_t nprocs;
|
380 | 381 | char *error = NULL;
|
381 |
| - char *cmd=NULL, *av=NULL; |
382 | 382 | ompi_errhandler_errtrk_t errtrk;
|
383 | 383 | volatile bool active;
|
384 | 384 | opal_list_t info;
|
@@ -484,15 +484,13 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided)
|
484 | 484 | * the requested thread level
|
485 | 485 | */
|
486 | 486 | if (NULL == getenv("OMPI_COMMAND") && NULL != argv && NULL != argv[0]) {
|
487 |
| - asprintf(&cmd, "OMPI_COMMAND=%s", argv[0]); |
488 |
| - putenv(cmd); |
| 487 | + opal_setenv("OMPI_COMMAND", argv[0], true, &environ); |
489 | 488 | }
|
490 | 489 | if (NULL == getenv("OMPI_ARGV") && 1 < argc) {
|
491 | 490 | char *tmp;
|
492 | 491 | tmp = opal_argv_join(&argv[1], ' ');
|
493 |
| - asprintf(&av, "OMPI_ARGV=%s", tmp); |
| 492 | + opal_setenv("OMPI_ARGV", tmp, true, &environ); |
494 | 493 | free(tmp);
|
495 |
| - putenv(av); |
496 | 494 | }
|
497 | 495 |
|
498 | 496 | /* open the rte framework */
|
|
0 commit comments