diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template index 06cfb6d1ba..19ed2a8f41 100644 --- a/BaseTools/Conf/build_rule.template +++ b/BaseTools/Conf/build_rule.template @@ -135,7 +135,9 @@ "$(ASM)" /Fo${dst} $(ASM_FLAGS) $(INC) ${d_path}(+)${s_base}.iii - "$(ASM)" -o ${dst} $(ASM_FLAGS) $(INC) ${src} + "$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i + Trim --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i + "$(ASM)" -o ${dst} $(ASM_FLAGS) $(INC) ${d_path}(+)${s_base}.iii [Build.Iasm-Code-File] diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template index f2ffd50951..252312bc3a 100644 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -357,7 +357,7 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT *_CYGWINGCC_*_MAKE_FLAGS = /nologo *_CYGWINGCC_*_DLINK_FLAGS = -nostdlib -O2 --gc-sections --dll --export-all-symbols --entry _$(ENTRYPOINT) --file-alignment 0x20 --section-alignment 0x20 -*_CYGWINGCC_*_ASM_FLAGS = -c -imacros AutoGen.h +*_CYGWINGCC_*_ASM_FLAGS = -c -x assembler -imacros AutoGen.h *_CYGWINGCC_*_PP_FLAGS = -E -x assembler-with-cpp -include AutoGen.h *_CYGWINGCC_*_VFRPP_FLAGS = -x c -E -P -DVFRCOMPILE --include AutoGen.h