fix: more robust match equation generation #48139

Job	Run time
configure	6s
build / Linux Lake	32m 35s
build-secondary / macOS aarch64	53m 59s
build-secondary / Linux release	41m 20s
Build matrix complete	4s
release	-1s
release-nightly	-1s
	2h 8m 2s

Provide feedback