Changed the GnuMakefile to Makefile as a workaround for CYGWINGCC toolchain build

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

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index e138f9d84c8390422b6fd6ebcdaffe7c748b56dc..6c6286478e50f4b1d48db37b09ba4bdc3f52b36a 100644 (file)
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -50,7 +50,7 @@
 \r
 ## Macro\r
 #   $(WORKSPACE)        Workspace directory\r
-#   $(OUTPUT_DIR)       Directory for intermediate files for building a module \r
+#   $(OUTPUT_DIR)       Directory for intermediate files for building a module\r
 #   $(DEBUG_DIR)        Directory for files used to debug a module\r
 #   $(BUILD_DIR)        All files for building a platform will be put in this directory\r
 #   $(BIN_DIR)          Common directory for executable files\r
@@ -145,8 +145,9 @@
         $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj\r
 \r
     <Command.MSFT, Command.INTEL>\r
-        "$(APP)" $(APP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
-        "$(ASM)" -o ${dst} $(ASM_FLAGS) ${d_path}(+)${s_base}.i\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) ${d_path}(+)${s_base}.iii\r
 \r
 [Build.Visual-Form-Representation-File]\r
     <InputFile>\r
@@ -208,8 +209,13 @@
         "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -( $(DLINK_SPATH) $(LIBS) ${src} -)\r
 \r
 [Build.Dynamic-Library-File]\r
-    <InputFile>\r
+    <InputFile.MSFT, InputFile.INTEL>\r
         ?.dll\r
+        $(MODULE_BUILD_DIR)\Makefile\r
+\r
+    <InputFile.GCC>\r
+        ?.dll\r
+        $(MODULE_BUILD_DIR)\Makefile\r
 \r
     <OutputFile>\r
         $(DEBUG_DIR)(+)$(MODULE_NAME).efi\r
@@ -239,8 +245,7 @@
 \r
     <Command.MSFT, Command.INTEL>\r
         "$(PP)" $(APP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
-        Trim --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i\r
-        "$(ASL)" -p ${dst} ${d_path}(+)${s_base}.iii\r
+        "$(ASL)" -p ${dst} ${d_path}(+)${s_base}.i\r
 \r
 [Build.Acpi-Table-Code-File]\r
     <InputFile>\r
@@ -251,7 +256,7 @@
 \r
     <Command.MSFT, Command.INTEL>\r
         "$(CC)" /Fo$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(CC_FLAGS) $(INC) ${src}\r
-        "$(DLINK)" /OUT:$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(SLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj \r
+        "$(DLINK)" /OUT:$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(SLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj\r
         GenFw -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll\r
 \r
 [Build.Masm16-Code-File]\r