Skip to content

Commit cd6a203

Browse files
committed
8297348: make CONF=xxx should match if xxx is an exact match
Reviewed-by: erikj
1 parent 817e039 commit cd6a203

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

make/InitSupport.gmk

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,15 @@ ifeq ($(HAS_SPEC),)
204204
# Otherwise select those that contain the given CONF string
205205
matching_confs := $$(strip $$(foreach var, $$(all_confs), \
206206
$$(if $$(findstring $$(CONF), $$(var)), $$(var))))
207+
ifneq ($$(filter $$(CONF), $$(matching_confs)), )
208+
# If we found an exact match, use that
209+
matching_confs := $$(CONF)
210+
# Don't repeat this output on make restarts caused by including
211+
# generated files.
212+
ifeq ($$(MAKE_RESTARTS),)
213+
$$(info Using exact match for CONF=$$(CONF) (other matches are possible))
214+
endif
215+
endif
207216
endif
208217
ifeq ($$(matching_confs),)
209218
$$(info Error: No configurations found matching CONF=$$(CONF).)

0 commit comments

Comments
 (0)