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

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index 422ee8e836..ba9d4800fb 100644
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -17,14 +17,14 @@
 # "*" is used to indicate that the source files will be processed at the same time.
 # "?" is used to indicate that the source files will be processed one by one.
 #
-# "[" Build.<File-Type>[.<version>][, Build.<File-Type>[.<version>]] "]"
-#   <InputFile[.<ToolChainFamily>]>
+# "[" Build.<File-Type>[.<version>][, Build.<File-Type>[.<version>]] "]" <EOL>
+#   <InputFile[.<ToolChainFamily>]> <EOL>
 #       [File-Type =] (?|*).<File-Extension> [(\n|,|;) (?|*).<File-Extension>]
 #
-#   <OutputFile[.<ToolChainFamily>]>
+#   <OutputFile[.<ToolChainFamily>]> <EOL>
 #       <FileFullPath>
 #
-#   <Command[.<ToolChainFamily>]>
+#   <Command[.<ToolChainFamily>]> <EOL>
 #       <Command1>
 #       [<Command2>]
 #
@@ -50,7 +50,7 @@
 
 ## Macro
 #   $(WORKSPACE)        Workspace directory
-#   $(OUTPUT_DIR)       Directory for intermediate files for building a module 
+#   $(OUTPUT_DIR)       Directory for intermediate files for building a module
 #   $(DEBUG_DIR)        Directory for files used to debug a module
 #   $(BUILD_DIR)        All files for building a platform will be put in this directory
 #   $(BIN_DIR)          Common directory for executable files
@@ -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>
@@ -145,8 +147,9 @@
         $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
 
     <Command.MSFT, Command.INTEL>
-        "$(APP)" $(APP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
-        "$(ASM)" -o ${dst} $(ASM_FLAGS) ${d_path}(+)${s_base}.i
+        "$(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) ${d_path}(+)${s_base}.iii
 
 [Build.Visual-Form-Representation-File]
     <InputFile>
@@ -172,7 +175,7 @@
         $(OUTPUT_DIR)(+)$(MODULE_NAME).lib
 
     <Command.MSFT, Command.INTEL>
-        "$(SLINK)" /OUT:${dst} $(SLINK_FLAGS) ${src}
+        "$(SLINK)" $(SLINK_FLAGS) /OUT:${dst} ${src}
 
     <Command.GCC>
         "$(SLINK)" -cr ${dst} $(SLINK_FLAGS) ${src}
@@ -194,8 +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
@@ -204,7 +214,7 @@
         "$(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>
@@ -226,7 +236,7 @@
     <OutputFile>
         $(OUTPUT_DIR)(+)$(MODULE_NAME).depex
 
-    <Command.MSFT>
+    <Command>
 #       GenDepex -o ${dst} ${src}
 
 [Build.Acpi-Source-Language-File]
@@ -238,8 +248,7 @@
 
     <Command.MSFT, Command.INTEL>
         "$(PP)" $(APP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
-        Trim --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i
-        "$(ASL)" -p ${dst} ${d_path}(+)${s_base}.iii
+        "$(ASL)" -p ${dst} ${d_path}(+)${s_base}.i
 
 [Build.Acpi-Table-Code-File]
     <InputFile>
@@ -248,9 +257,9 @@
     <OutputFile>
         $(OUTPUT_DIR)(+)${s_base}.acpi
 
-    <Command.MSFT>
+    <Command.MSFT, Command.INTEL>
         "$(CC)" /Fo$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(CC_FLAGS) $(INC) ${src}
-        "$(DLINK)" /OUT:$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(SLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj 
+        "$(DLINK)" /OUT:$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(SLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
         GenFw -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll
 
 [Build.Masm16-Code-File]
@@ -258,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>