Make updated toolchain file backwards compatible