X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FConf%2FBuildMacro.xml;h=85118fb73faad5e828bdbd0aabe3dc5551df9597;hp=dc5bcfb5eadeff2b49e3a3c431a58d7965ab2c60;hb=aba23ad92e37106b379d36a9a874cca2f0bdc829;hpb=26a3d4ab1807e0548fae3c2b7bfc342c4fa845e8

diff --git a/Tools/Conf/BuildMacro.xml b/Tools/Conf/BuildMacro.xml
index dc5bcfb5ea..85118fb73f 100644
--- a/Tools/Conf/BuildMacro.xml
+++ b/Tools/Conf/BuildMacro.xml
@@ -57,14 +57,20 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
               <if>
                 <equals arg1="${CC_FAMILY}" arg2="GCC"/>
                 <then>
-                  <move file="${DEST_DIR_OUTPUT}/AutoGen.h.obj" tofile="${DEST_DIR_OUTPUT}/AutoGen.h.gch" overwrite="true"/>
+                  <move file="${DEST_DIR_OUTPUT}/AutoGen.h.obj" tofile="${DEST_DIR_DEBUG}/AutoGen.h.gch" overwrite="true"/>
                 </then>
-                <else>
-                  <var name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}/AutoGen.h.obj"/>
-                </else>
               </if>
             </sequential>
           </OnDependency>
+
+          <if>
+            <not>
+              <equals arg1="${CC_FAMILY}" arg2="GCC"/>
+            </not>
+            <then>
+              <var name="OBJECTS" value="${OBJECTS} AutoGen.h.obj"/>
+            </then>
+          </if>
         </then>
       </if>
     </sequential>
@@ -504,12 +510,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <sequential>
       <var name="FILE_BASENAME" value="@{FILENAME}" />
       <var name="FILE_PATH" value="." />
-      <if>
-        <available type="file" file="${DEST_DIR_OUTPUT}/AutoGen.h.obj"/>
-        <then>
-          <var name="SLINK_FLAGS" value="${SLINK_FLAGS} ${DEST_DIR_OUTPUT}/AutoGen.h.obj"/>
-        </then>
-      </if>
       <mkdir dir="${BIN_DIR}"/>
 
       <OnDependency>
@@ -753,12 +753,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <sequential>
       <var name="FILE_BASENAME" value="@{FILENAME}" />
       <var name="FILE_PATH" value="@{FILEPATH}" />
-      <if>
-        <available type="file" file="${DEST_DIR_OUTPUT}/AutoGen.h.obj"/>
-        <then>
-          <var name="SLINK_FLAGS" value="${SLINK_FLAGS} ${DEST_DIR_OUTPUT}/AutoGen.h.obj"/>
-        </then>
-      </if>
       <OnDependency>
         <sourcefiles>
           <file list="${LIBS}"/>