Fix bug 909 #656

Job	Run time
Build (ubuntu:noble, gcc, LEGACY, OFF, true)	11m 45s
Build (ubuntu:noble, clang, LEGACY, OFF, true)	12m 25s
Build (ubuntu:noble, gcc, GLVND, OFF, true)	11m 54s
Build (ubuntu:noble, clang, GLVND, OFF, true)	12m 20s
Build (ubuntu:jammy, gcc, GLVND, OFF, false)	9m 53s
Build (ubuntu:jammy, clang, GLVND, OFF, false)	12m 0s
Build (ubuntu:focal, gcc, GLVND, OFF, false)	11m 43s
Build (ubuntu:focal, clang, GLVND, OFF, false)	11m 12s
Build (linuxmintd/mint22-amd64, clang, GLVND, OFF, true)	12m 45s
Build (linuxmintd/mint21.3-amd64, clang, GLVND, OFF, true)	12m 14s
Build (linuxmintd/mint21.2-amd64, clang, GLVND, OFF, true)	12m 9s
Build (linuxmintd/mint21.1-amd64, clang, GLVND, OFF, true)	12m 42s
Build (linuxmintd/mint21-amd64, clang, GLVND, OFF, false)	12m 28s
Build (linuxmintd/mint20-amd64, clang, GLVND, OFF, false)	11m 18s
Build (debian:bookworm, clang, GLVND, OFF, false)	12m 7s
Build (debian:bullseye, clang, GLVND, OFF, false)	12m 28s
Build (opensuse/leap:15.6, clang, LEGACY, ON, true)	11m 30s
Build (opensuse/leap:15.6, clang, GLVND, ON, true)	11m 46s
Build (opensuse/leap:15.5, clang, LEGACY, ON, true)	10m 47s
Build (opensuse/leap:15.5, clang, GLVND, ON, true)	10m 54s
Build (opensuse/leap:15.4, clang, GLVND, ON, false)	11m 23s
Build (fedora:39, clang, LEGACY, ON, true)	11m 59s
Build (fedora:39, clang, GLVND, ON, true)	11m 42s
Build (fedora:40, clang, LEGACY, ON, true)	11m 33s
Build (fedora:40, clang, GLVND, ON, false)	11m 37s
Build (rockylinux_rockylinux:9.4, clang, GLVND, ON, false)	12m 15s
	5h 6m 49s

Provide feedback