X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FJava%2FSource%2FGenBuild%2Forg%2Ftianocore%2Fbuild%2Ftoolchain%2FToolChainConfig.java;h=9989ab65f848450b4090b404f4694536f8e888e9;hp=b12c43662c5ab884ad628dd279eec9c1507a5bdd;hb=2251a3601382e62e2b947512e51560d1f73dfd05;hpb=feccee87a78e68d575dbdf44b34ca0cb5a21ea8d

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/toolchain/ToolChainConfig.java b/Tools/Java/Source/GenBuild/org/tianocore/build/toolchain/ToolChainConfig.java
index b12c43662c..9989ab65f8 100644
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/toolchain/ToolChainConfig.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/toolchain/ToolChainConfig.java
@@ -15,14 +15,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/
 package org.tianocore.build.toolchain;
 
-import org.tianocore.build.exception.GenBuildException;
-import org.tianocore.build.toolchain.ToolChainKey;
-import org.tianocore.build.toolchain.ToolChainMap;
-
 import java.io.File;
 import java.util.Iterator;
 import java.util.Set;
 
+import org.apache.tools.ant.Project;
+import org.tianocore.build.exception.GenBuildException;
+import org.tianocore.build.toolchain.ToolChainKey;
+import org.tianocore.build.toolchain.ToolChainMap;
+
 
 /**
  
@@ -44,8 +45,8 @@ public class ToolChainConfig {
       
       @param toolChainFile File object representing the tool chain configuration file
     **/
-    public ToolChainConfig (File toolChainFile) throws GenBuildException {
-        config = getToolChainConfig(toolChainFile);
+    public ToolChainConfig (Project prj, File toolChainFile) throws GenBuildException {
+        config = getToolChainConfig(prj, toolChainFile);
         parseToolChainDefKey(config.keySet());
     }
 
@@ -57,9 +58,9 @@ public class ToolChainConfig {
        
        @return ToolChainMap
      **/
-    private ToolChainMap getToolChainConfig(File ConfigFile) throws GenBuildException {
+    private ToolChainMap getToolChainConfig(Project prj, File ConfigFile) throws GenBuildException {
         ToolChainMap map = new ToolChainMap();
-        String[][] toolChainDef = ConfigReader.parse(ConfigFile);
+        String[][] toolChainDef = ConfigReader.parse(prj, ConfigFile);
     
         for (int i = 0; i < toolChainDef[0].length; ++i) {
             map.put(toolChainDef[0][i], toolChainDef[1][i]);
@@ -83,6 +84,7 @@ public class ToolChainConfig {
             info.addTagnames(keySet[ToolChainElement.TOOLCHAIN.value]);
             info.addArchs(keySet[ToolChainElement.ARCH.value]);
             info.addCommands(keySet[ToolChainElement.TOOLCODE.value]);
+            info.normalize();
         }
     }