The changes in #67548 broke cross-compilation not for valgrind, but for software relying on valgrind at build-time.