]> git.proxmox.com Git - mirror_edk2.git/blobdiff - Tools/Conf/BuildMacro.xml
Fixed EDKT381
[mirror_edk2.git] / Tools / Conf / BuildMacro.xml
index dc5bcfb5eadeff2b49e3a3c431a58d7965ab2c60..71814450e532cb9b266fa9857052cef43fef195a 100644 (file)
@@ -22,7 +22,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <var name="SDB_FILES" value="" />\r
 \r
       <if>\r
-        <isset property="PCH"/>\r
+        <and>\r
+          <isset property="PCH"/>\r
+          <not>\r
+            <equals arg1="${PCH}" arg2=""/>\r
+          </not>\r
+        </and>\r
         <then>\r
           <if>\r
             <available type="file" file="${DEST_DIR_OUTPUT}/AutoGen.h.gch"/>\r
@@ -57,14 +62,20 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
               <if>\r
                 <equals arg1="${CC_FAMILY}" arg2="GCC"/>\r
                 <then>\r
-                  <move file="${DEST_DIR_OUTPUT}/AutoGen.h.obj" tofile="${DEST_DIR_OUTPUT}/AutoGen.h.gch" overwrite="true"/>\r
+                  <move file="${DEST_DIR_OUTPUT}/AutoGen.h.obj" tofile="${DEST_DIR_DEBUG}/AutoGen.h.gch" overwrite="true"/>\r
                 </then>\r
-                <else>\r
-                  <var name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}/AutoGen.h.obj"/>\r
-                </else>\r
               </if>\r
             </sequential>\r
           </OnDependency>\r
+\r
+          <if>\r
+            <not>\r
+              <equals arg1="${CC_FAMILY}" arg2="GCC"/>\r
+            </not>\r
+            <then>\r
+              <var name="OBJECTS" value="${OBJECTS} AutoGen.h.obj"/>\r
+            </then>\r
+          </if>\r
         </then>\r
       </if>\r
     </sequential>\r
@@ -504,12 +515,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <sequential>\r
       <var name="FILE_BASENAME" value="@{FILENAME}" />\r
       <var name="FILE_PATH" value="." />\r
-      <if>\r
-        <available type="file" file="${DEST_DIR_OUTPUT}/AutoGen.h.obj"/>\r
-        <then>\r
-          <var name="SLINK_FLAGS" value="${SLINK_FLAGS} ${DEST_DIR_OUTPUT}/AutoGen.h.obj"/>\r
-        </then>\r
-      </if>\r
       <mkdir dir="${BIN_DIR}"/>\r
 \r
       <OnDependency>\r
@@ -753,12 +758,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <sequential>\r
       <var name="FILE_BASENAME" value="@{FILENAME}" />\r
       <var name="FILE_PATH" value="@{FILEPATH}" />\r
-      <if>\r
-        <available type="file" file="${DEST_DIR_OUTPUT}/AutoGen.h.obj"/>\r
-        <then>\r
-          <var name="SLINK_FLAGS" value="${SLINK_FLAGS} ${DEST_DIR_OUTPUT}/AutoGen.h.obj"/>\r
-        </then>\r
-      </if>\r
       <OnDependency>\r
         <sourcefiles>\r
           <file list="${LIBS}"/>\r