BaseTools/Conf/build_rule.template:

[mirror_edk2.git] / BaseTools / Conf / build_rule.template

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