From: mdkinney <mdkinney@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Wed, 4 Oct 2006 23:01:10 +0000 (+0000)
Subject: Update GenBuild to append FLAGS from FPD files to the FLAGS defined in tools_def.txt
X-Git-Tag: edk2-stable201903~24217
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=e04a8a9aae024ca64753c1106b48f20b6c417b09

Update GenBuild to append FLAGS from FPD files to the FLAGS defined in tools_def.txt


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1657 6f19259b-4bc3-4df7-8a09-765794883524
---

diff --git a/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java b/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java
index b053bdd566..99767ab4f2 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java
@@ -488,10 +488,19 @@ public class GenBuildTask extends Ant {
             //
             key[4] = ToolDefinitions.TOOLS_DEF_ATTRIBUTE_FLAGS;
             String cmdFlags = GlobalData.getCommandSetting(key, fpdModuleId);
-            Set<String> addset = new LinkedHashSet<String>();
-            Set<String> subset = new LinkedHashSet<String>();
-            putFlagsToSet(addset, cmdFlags);
-            getProject().setProperty(cmd[m] + "_FLAGS", getProject().replaceProperties(getFlags(addset, subset)));
+            if (cmdFlags != null) 
+            {
+//              Set<String> addset = new LinkedHashSet<String>();
+//              Set<String> subset = new LinkedHashSet<String>();
+//              putFlagsToSet(addset, cmdFlags);
+//              getProject().setProperty(cmd[m] + "_FLAGS", getProject().replaceProperties(getFlags(addset, subset)));
+              getProject().setProperty(cmd[m] + "_FLAGS", cmdFlags);
+            } 
+            else 
+            {
+              getProject().setProperty(cmd[m] + "_FLAGS", "");
+            }
+
 
             //
             // Set CC_EXT