Rollback to last revision. No need to enforce the ARCH for 'CompilerStub' library.

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

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index ba9d4800fbcb451f42997547496315c2b75bc5e6..d1ff1f928d47d7b4405d78b40b0db1ec32c56dc9 100644 (file)
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -78,7 +78,7 @@
 \r
 ## Reserved File-Type\r
 #\r
-# Dont't change following names of file types and their associated files,\r
+# Don't change following names of file types and their associated files,\r
 # which are also used in tools' code\r
 #\r
 #   C-Code-File\r
@@ -200,12 +200,12 @@
     <InputFile.MSFT, InputFile.Intel>\r
         ?.lib\r
         $(LIBS)\r
-        $(MODULE_BUILD_DIR)\Makefile\r
+        $(MAKE_FILE)\r
 \r
     <InputFile.GCC>\r
         ?.lib\r
         $(LIBS)\r
-        $(MODULE_BUILD_DIR)/GNUmakefile\r
+        $(MAKE_FILE)\r
 \r
     <OutputFile>\r
         $(DEBUG_DIR)(+)$(MODULE_NAME).dll\r
@@ -237,7 +237,9 @@
         $(OUTPUT_DIR)(+)$(MODULE_NAME).depex\r
 \r
     <Command>\r
-#       GenDepex -o ${dst} ${src}\r
+        "$(PP)" $(CC_FLAGS) $(APP_FLAGS) $(INC) ${src} > $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i\r
+        Trim --source-code -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i\r
+        GenDepex -t $(MODULE_TYPE) -o ${dst} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii\r
 \r
 [Build.Acpi-Source-Language-File]\r
     <InputFile>\r
@@ -248,7 +250,7 @@
 \r
     <Command.MSFT, Command.INTEL>\r
         "$(PP)" $(APP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
-        "$(ASL)" -p ${dst} ${d_path}(+)${s_base}.i\r
+        "$(ASL)" -p ${dst} $(ASL_FLAGS) ${d_path}(+)${s_base}.i\r
 \r
 [Build.Acpi-Table-Code-File]\r
     <InputFile>\r