1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8348392: Make claims "other matches are possible" even when that is not true

Browse Source 
Reviewed-by: erikj
This commit is contained in:
Magnus Ihse Bursie 2025-01-23 14:47:14 +00:00
parent 5cc690d31e
commit 7460a0aff4
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
make/InitSupport.gmk
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -211,14 +211,16 @@ ifeq ($(HAS_SPEC), )
$$(if $$(findstring $$(CONF), $$(var)), $$(var)))) $$(if $$(findstring $$(CONF), $$(var)), $$(var))))
endif endif
ifneq ($$(filter $$(CONF), $$(matching_confs)), ) ifneq ($$(filter $$(CONF), $$(matching_confs)), )
# If we found an exact match, use that ifneq ($$(word 2, $$(matching_confs)), )
matching_confs := $$(CONF)
# Don't repeat this output on make restarts caused by including # Don't repeat this output on make restarts caused by including
# generated files. # generated files.
ifeq ($$(MAKE_RESTARTS), ) ifeq ($$(MAKE_RESTARTS), )
$$(info Using exact match for CONF=$$(CONF) (other matches are possible)) $$(info Using exact match for CONF=$$(CONF) (other matches are possible))
endif endif
endif endif
# If we found an exact match, use that
matching_confs := $$(CONF)
endif
endif endif
ifeq ($$(matching_confs), ) ifeq ($$(matching_confs), )
$$(info Error: No configurations found matching CONF=$$(CONF).) $$(info Error: No configurations found matching CONF=$$(CONF).)