Restoring $WORKSPACE/BaseTools location, as the plan is to deprecate

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

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index 06cfb6d1ba33db07f91dccc3d1719b767d6771b1..5c22a0badd6082aa5f0a1ff4765997261075e304 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
@@ -260,13 +262,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