4.9 Toolchain modifications on build folder