fix: more robust match equation generation #48666

Job	Run time
configure	3s
build-secondary / macOS aarch64	1h 2m 36s
build-secondary / Linux release	39m 56s
build / Linux Lake	10m 43s
Build matrix complete	5s
release	-1s
release-nightly	-1s
	1h 53m 21s

Provide feedback