From e04a8a9aae024ca64753c1106b48f20b6c417b09 Mon Sep 17 00:00:00 2001 From: mdkinney Date: Wed, 4 Oct 2006 23:01:10 +0000 Subject: 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 --- .../GenBuild/org/tianocore/build/GenBuildTask.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) 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 addset = new LinkedHashSet(); - Set subset = new LinkedHashSet(); - putFlagsToSet(addset, cmdFlags); - getProject().setProperty(cmd[m] + "_FLAGS", getProject().replaceProperties(getFlags(addset, subset))); + if (cmdFlags != null) + { +// Set addset = new LinkedHashSet(); +// Set subset = new LinkedHashSet(); +// 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 -- cgit v1.2.3