Uses/compiler.mk fixed upstream