update build for new optimised toolchain
preservative: switch from conservative style behaviour to ondemand style