Skip to content

Commit 78dfe45

Browse files
committed
build: Fix PRRTE prefix_by_default handling
Fix typo that broke backward-compatible prefix-by-default argument handling. Remove some dead code while we're here. Signed-off-by: Brian Barrett <bbarrett@amazon.com>
1 parent f500371 commit 78dfe45

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

config/ompi_setup_prrte.m4

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ AC_DEFUN([OMPI_SETUP_PRRTE_INTERNAL], [
100100
# user did not specify an option. PRTE defaults to not enabling
101101
# prefix-by-default, but open mpi wants that behavior.
102102
AS_IF([test -n "$deprecated_prefix_by_default"],
103-
[internal_prrte_args="internal_prrte_args --enable-prte-prefix-by-default=$deprecated_prefix_by_default"],
103+
[internal_prrte_args="$internal_prrte_args --enable-prte-prefix-by-default=$deprecated_prefix_by_default"],
104104
[test -z "$enable_prte_prefix_by_default"],
105105
[internal_prrte_args="$internal_prrte_args --enable-prte-prefix-by-default"])
106106

@@ -137,9 +137,6 @@ AC_DEFUN([OMPI_SETUP_PRRTE_INTERNAL], [
137137
AC_MSG_WARN([--disable-internal-rte option.])
138138
AC_MSG_ERROR([Cannot continue])])])
139139

140-
dnl AS_IF([test ! -z $with_prrte_platform && test "$with_prrte_platform" != "yes"],
141-
dnl [internal_prrte_args="$internal_prrte_args --with-platform=$with_prrte_platform"])
142-
143140
# add the extra libs
144141
internal_prrte_args="$internal_prrte_args --with-prte-extra-lib=\"$internal_prrte_libs\" --with-prte-extra-ltlib=\"$internal_prrte_libs\""
145142

0 commit comments

Comments
 (0)