2.21: Updated Makefile #19958

Job	Run time
build_cmake (alpine:3.23, false, false)	4m 28s
build_cmake (ubuntu:25.10, true, true)	5m 35s
build_make (ubuntu:25.10)	4m 47s
build_make (alpine:3.23)	6m 25s
build_cmake (ubuntu:24.04, true, true)	4m 42s
build_make (ubuntu:24.04)	4m 49s
	30m 46s

Provide feedback