Fix bug 900 #640

Job	Run time
Build (ubuntu:noble, gcc, LEGACY, OFF, true)	11m 34s
Build (ubuntu:noble, clang, LEGACY, OFF, true)	12m 54s
Build (ubuntu:noble, gcc, GLVND, OFF, true)	11m 45s
Build (ubuntu:noble, clang, GLVND, OFF, true)	12m 23s
Build (ubuntu:jammy, gcc, GLVND, OFF, false)	10m 1s
Build (ubuntu:jammy, clang, GLVND, OFF, false)	11m 49s
Build (ubuntu:focal, gcc, GLVND, OFF, false)	12m 3s
Build (ubuntu:focal, clang, GLVND, OFF, false)	11m 8s
Build (linuxmintd/mint22-amd64, clang, GLVND, OFF, true)	12m 44s
Build (linuxmintd/mint21.3-amd64, clang, GLVND, OFF, true)	12m 8s
Build (linuxmintd/mint21.2-amd64, clang, GLVND, OFF, true)	12m 26s
Build (linuxmintd/mint21.1-amd64, clang, GLVND, OFF, true)	12m 10s
Build (linuxmintd/mint21-amd64, clang, GLVND, OFF, false)	12m 24s
Build (linuxmintd/mint20-amd64, clang, GLVND, OFF, false)	11m 22s
Build (debian:bookworm, clang, GLVND, OFF, false)	12m 4s
Build (debian:bullseye, clang, GLVND, OFF, false)	12m 26s
Build (opensuse/leap:15.6, clang, LEGACY, ON, true)	11m 28s
Build (opensuse/leap:15.6, clang, GLVND, ON, true)	11m 30s
Build (opensuse/leap:15.5, clang, LEGACY, ON, true)	10m 56s
Build (opensuse/leap:15.5, clang, GLVND, ON, true)	10m 55s
Build (opensuse/leap:15.4, clang, GLVND, ON, false)	11m 43s
Build (fedora:39, clang, LEGACY, ON, true)	11m 38s
Build (fedora:39, clang, GLVND, ON, true)	11m 40s
Build (fedora:40, clang, LEGACY, ON, true)	11m 53s
Build (fedora:40, clang, GLVND, ON, false)	11m 41s
Build (rockylinux_rockylinux:9.4, clang, GLVND, ON, false)	12m 2s
	5h 6m 47s

Provide feedback