Fixed toolchain naming (TOOLCHAIN now includes trailing '-')