Skip to content

Commit 57df108

Browse files
committed
build: Fix sed expression used to ignore subconfig args
The ignore argument to PAC_CONFIG_SUBDIR_ARGS is an m4 list of sed expressions. --with-platform=.* ignored not just the platform argument, but everything after it. Fix the regular expressions to ignore everything until the next whitespace. This probably still isn't entirely right, because it will fail if the argument has spaces in it (like a path with spaces), but we fail that test so many other places that it does not add to the fail. Signed-off-by: Brian Barrett <bbarrett@amazon.com>
1 parent e5d6952 commit 57df108

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

config/ompi_setup_prrte.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ dnl [internal_prrte_args="$internal_prrte_args --with-platform=$with_prrt
148148
[[--with-libevent=internal], [--with-hwloc=internal],
149149
[--with-libevent=external], [--with-hwloc=external],
150150
[--with-pmix=internal], [--with-pmix=external],
151-
[--with-platform=.*]],
151+
[--with-platform=[[^ ]]*]],
152152
[], [internal_prrte_happy="no"])
153153
OPAL_3RDPARTY_DIST_SUBDIRS="$OPAL_3RDPARTY_DIST_SUBDIRS prrte"
154154

config/opal_config_pmix.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ AC_DEFUN([OPAL_CONFIG_PMIX], [
9191
PAC_CONFIG_SUBDIR_ARGS([3rd-party/openpmix], [$internal_pmix_args],
9292
[[--with-libevent=internal], [--with-hwloc=internal],
9393
[--with-libevent=external], [--with-hwloc=external],
94-
[--with-pmix=.*], [--with-platform=.*]],
94+
[--with-pmix=[[^ ]]*], [--with-platform=[[^ ]]*]],
9595
[internal_pmix_happy=1])
9696
OPAL_3RDPARTY_DIST_SUBDIRS="$OPAL_3RDPARTY_DIST_SUBDIRS openpmix"])
9797

0 commit comments

Comments
 (0)