X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Tools%2FSource%2FGenBuild%2Forg%2Ftianocore%2Fbuild%2Fglobal%2FOutputManager.java;h=2c70326202fdabf164573ff5ff5300d3fded99fd;hb=2619585ad0a13a369f3983f9c2d85b25778e4f30;hp=773fe3e94922b395e06c1fade0e6712af65704b7;hpb=a29c47e01d9689fad735bbeccfaef67676a425d1;p=mirror_edk2.git

diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/OutputManager.java b/Tools/Source/GenBuild/org/tianocore/build/global/OutputManager.java
index 773fe3e949..2c70326202 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/global/OutputManager.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/OutputManager.java
@@ -86,7 +86,6 @@ public class OutputManager {
       @param type the module build type (MODULE or UNIFIED)
     **/
     public void update(Project project) {
-//        GlobalData.log.info("" + userdir + ":" + type);
         //
         // Default mode is UNIFIED. 
         //
@@ -124,16 +123,18 @@ public class OutputManager {
             }
         }
         
+        //
+        // Define TARGET_DIR
+        //
+        String targetDir = buildDir + File.separatorChar + project.getProperty("TARGET")
+                                    + "_" + project.getProperty("TOOLCHAIN");
+        
         //
         // Define BIN_DIR and FV_DIR
         //
-        String binDir = buildDir + File.separatorChar + project.getProperty("TARGET")
-                                 + File.separatorChar + project.getProperty("TOOLCHAIN") 
-                                 + File.separatorChar + project.getProperty("ARCH") ;
+        String binDir = targetDir + File.separatorChar + project.getProperty("ARCH") ;
         
-        String fvDir = buildDir + File.separatorChar + project.getProperty("TARGET")
-                                + File.separatorChar + project.getProperty("TOOLCHAIN") 
-                                + File.separatorChar + "FV";
+        String fvDir = targetDir + File.separatorChar + "FV";
         
         //
         // Define DEST_DIR_OUTPUT and DEST_DIR_DEBUG
@@ -145,6 +146,7 @@ public class OutputManager {
         // Set properties
         //
         project.setProperty("BUILD_DIR", buildDir.replaceAll("(\\\\)", "/"));
+        project.setProperty("TARGET_DIR", targetDir.replaceAll("(\\\\)", "/"));
         project.setProperty("FV_DIR", fvDir.replaceAll("(\\\\)", "/"));
         project.setProperty("BIN_DIR", binDir.replaceAll("(\\\\)", "/"));
         project.setProperty("DEST_DIR_DEBUG", (destDir + File.separatorChar + "DEBUG").replaceAll("(\\\\)", "/"));
@@ -183,6 +185,7 @@ public class OutputManager {
                 buildDir = GlobalData.getWorkspacePath() + File.separatorChar + userdir;
             }
         }
+        
         //
         // Set to property
         //