Fixed the build error.

[mirror_edk2.git] / Tools / Java / Source / GenBuild / org / tianocore / build / global / GlobalData.java

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/global/GlobalData.java b/Tools/Java/Source/GenBuild/org/tianocore/build/global/GlobalData.java
index c736952377c71f6c808815eabb1b696cb6c89943..96558876e4b0f08a765353381db20db58c31f8ce 100644 (file)
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/global/GlobalData.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/global/GlobalData.java
@@ -23,6 +23,7 @@ import java.util.Collection;
 import java.util.HashMap;\r
 import java.util.HashSet;\r
 import java.util.Iterator;\r
+import java.util.LinkedHashSet;\r
 import java.util.List;\r
 import java.util.Map;\r
 import java.util.Set;\r
@@ -689,6 +690,7 @@ public class GlobalData {
             }\r
             toolChainInfo.addCommands(toolsDef.getConfigInfo().getCommands());\r
             toolChainInfo.normalize();\r
+\r
             EdkLog.log("Init", EdkLog.EDK_ALWAYS, "Current build tool chain information summary: ");\r
             EdkLog.log("Init", EdkLog.EDK_ALWAYS, toolChainInfo + "");\r
         }\r
@@ -723,7 +725,7 @@ public class GlobalData {
         msaFamilyBuildOption.put(moduleId, toolChainOption);\r
     }\r
     \r
-    public static boolean isCommandSet(String target, String toolchain, String arch) {\r
+    public static boolean isCommandSet(String target, String toolchain, String arch) throws EdkException {\r
         String[] commands = getToolChainInfo().getCommands();\r
 \r
         for (int i = 0; i < commands.length; ++i) {\r
@@ -768,6 +770,9 @@ public class GlobalData {
             return setting;\r
         }\r
 \r
+        Set<String> flagSet = new LinkedHashSet<String>();\r
+        flagSet.add(setting);\r
+        \r
         //\r
         // Tool's option can be in .fpd and/or .msa file\r
         //\r
@@ -785,7 +790,7 @@ public class GlobalData {
         //\r
         option = msaFamilyBuildOption.get(fpdModuleId.getModule());\r
         if (option != null && (optionString = option.get(toolChainFamilyKey)) != null) {\r
-            setting += (" " + optionString);\r
+            flagSet.add(optionString);\r
         }\r
         \r
         //\r
@@ -793,7 +798,7 @@ public class GlobalData {
         //\r
         option = msaBuildOption.get(fpdModuleId.getModule());\r
         if (option != null && (optionString = option.get(toolChainKey)) != null) {\r
-            setting += (" " + optionString);\r
+            flagSet.add(optionString);\r
         }\r
         \r
         //\r
@@ -801,7 +806,7 @@ public class GlobalData {
         //\r
         optionString = platformToolChainFamilyOption.get(toolChainFamilyKey);\r
         if (optionString != null) {\r
-            setting += (" " + optionString);\r
+            flagSet.add(optionString);\r
         }\r
 \r
         //\r
@@ -809,7 +814,7 @@ public class GlobalData {
         //\r
         optionString = platformToolChainOption.get(toolChainKey);\r
         if (optionString != null) {\r
-            setting += (" " + optionString);\r
+            flagSet.add(optionString);\r
         }\r
 \r
         //\r
@@ -817,7 +822,7 @@ public class GlobalData {
         //\r
         option = moduleToolChainFamilyOption.get(fpdModuleId);\r
         if (option != null && (optionString = option.get(toolChainFamilyKey)) != null) {\r
-            setting += (" " + optionString);\r
+            flagSet.add(optionString);\r
         }\r
 \r
         //\r
@@ -825,9 +830,13 @@ public class GlobalData {
         //\r
         option = moduleToolChainOption.get(fpdModuleId);\r
         if (option != null && (optionString = option.get(toolChainKey)) != null) {\r
-            setting += (" " + optionString);\r
+            flagSet.add(optionString);\r
+        }\r
+        \r
+        setting = "";\r
+        for(Iterator<String> iter = flagSet.iterator(); iter.hasNext();) {\r
+            setting += iter.next() +" ";\r
         }\r
-\r
         return setting;\r
     }\r
 \r