X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FSource%2FGenBuild%2Forg%2Ftianocore%2Fbuild%2Ffpd%2FPlatformBuildFileGenerator.java;h=dd812d8e8ababd70067f65d43a384d515326bc45;hp=ef6dc7223e535a03b5596cd4b672c19926569c90;hb=6ae1510e527a79a6958f0ada17c9ef6a4dfba5af;hpb=96c9ae450779b0d87510ddae647cc621553017b8

diff --git a/Tools/Source/GenBuild/org/tianocore/build/fpd/PlatformBuildFileGenerator.java b/Tools/Source/GenBuild/org/tianocore/build/fpd/PlatformBuildFileGenerator.java
index ef6dc7223e..dd812d8e8a 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/fpd/PlatformBuildFileGenerator.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/fpd/PlatformBuildFileGenerator.java
@@ -310,7 +310,7 @@ public class PlatformBuildFileGenerator {
             String[] toolchainList = GlobalData.getToolChainInfo().getTagnames();
             for(int j = 0; j < toolchainList.length; j++){
                 String fvOutputDir = project.getProperty("BUILD_DIR") + File.separatorChar 
-                                        + targetList[i] + File.separatorChar 
+                                        + targetList[i] + "_" 
                                         + toolchainList[j] + File.separatorChar + "FV";
                 String[] validFv = SurfaceAreaQuery.getFpdValidImageNames();
                 for (int k = 0; k < validFv.length; k++) {
@@ -422,9 +422,12 @@ public class PlatformBuildFileGenerator {
         if (isUnified) {
             String[] targetList = GlobalData.getToolChainInfo().getTargets();
             for (int i = 0; i < targetList.length; ++i) {
-                Element cleanAllEle = document.createElement("delete");
-                cleanAllEle.setAttribute("dir", project.getProperty("BUILD_DIR") + File.separatorChar + targetList[i]);
-                ele.appendChild(cleanAllEle);
+                String[] toolchainList = GlobalData.getToolChainInfo().getTagnames();
+                for(int j = 0; j < toolchainList.length; j++) {
+                    Element cleanAllEle = document.createElement("delete");
+                    cleanAllEle.setAttribute("dir", project.getProperty("BUILD_DIR") + File.separatorChar + targetList[i] + "_" + toolchainList[j]);
+                    ele.appendChild(cleanAllEle);
+                }
             }
         } else {
             Set set = outfiles.keySet();
@@ -517,7 +520,7 @@ public class PlatformBuildFileGenerator {
                     // Prepare FV_DIR
                     //
                     String ffsCommonDir = project.getProperty("BUILD_DIR") + File.separatorChar 
-                                    + targetList[i] + File.separatorChar 
+                                    + targetList[i] + "_" 
                                     + toolchainList[j];
                     File fvDir = new File(ffsCommonDir + File.separatorChar + "FV");
                     Element fvEle = document.createElement("var");
@@ -561,7 +564,7 @@ public class PlatformBuildFileGenerator {
                     // Prepare FV_DIR
                     //
                     String ffsCommonDir = project.getProperty("BUILD_DIR") + File.separatorChar 
-                                    + targetList[i] + File.separatorChar 
+                                    + targetList[i] + "_" 
                                     + toolchainList[j];
                     File fvDir = new File(ffsCommonDir + File.separatorChar + "FV");
                     Element fvEle = document.createElement("var");