X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=BaseTools%2FConf%2Fbuild_rule.template;h=ba9d4800fbcb451f42997547496315c2b75bc5e6;hb=9ba67b5c81a703c2b16861e93c7774014a6faa59;hp=4c1a795944d28a409ecd3bff0d464703093dcf92;hpb=dc66cae164f26ebe3755ef5abefdd9e324f474be;p=mirror_edk2.git

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index 4c1a795944..ba9d4800fb 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
 
     <Command.GCC>
-        "$(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]
     <InputFile>
@@ -195,9 +197,15 @@
 #        "$(SLINK)" -cr ${dst} $(SLINK_FLAGS) ${src1} -( ${src2} -)
 #
 [Build.Static-Library-File]
-    <InputFile>
+    <InputFile.MSFT, InputFile.Intel>
+        ?.lib
+        $(LIBS)
+        $(MODULE_BUILD_DIR)\Makefile
+
+    <InputFile.GCC>
         ?.lib
         $(LIBS)
+        $(MODULE_BUILD_DIR)/GNUmakefile
 
     <OutputFile>
         $(DEBUG_DIR)(+)$(MODULE_NAME).dll
@@ -206,16 +214,11 @@
         "$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK_SPATH) $(LIBS) ${src}
 
     <Command.GCC>
-        "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -( $(DLINK_SPATH) $(LIBS) ${src} -)
+        "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -\( $(DLINK_SPATH) $(LIBS) ${src} -\)
 
 [Build.Dynamic-Library-File]
-    <InputFile.MSFT, InputFile.INTEL>
-        ?.dll
-        $(MODULE_BUILD_DIR)\Makefile
-
-    <InputFile.GCC>
+    <InputFile>
         ?.dll
-        $(MODULE_BUILD_DIR)/GnuMakefile
 
     <OutputFile>
         $(DEBUG_DIR)(+)$(MODULE_NAME).efi
@@ -264,13 +267,12 @@
         ?.asm16, ?.Asm16, ?.ASM16
 
     <OutputFile>
-        $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.com
+        $(OUTPUT_DIR)(+)${s_base}.com
 
     <Command.MSFT, Command.INTEL>
-        pushd .
         cd $(OUTPUT_DIR)(+)${s_dir}
-        "$(ASM)" /nologo /omf ${src} /Bl"$(ASMLINK)" $(ASMLINK_FLAGS)
-        -$(CP) ${dst} $(OUTPUT_DIR) & popd
+        "$(ASM)" /nologo /c /omf /Fo$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj ${src}
+        "$(ASMLINK)" $(ASMLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj,${dst},,,,
 
 [Build.Microcode-File]
     <InputFile>