Fix conditional build of tools