diff options
| author | mdkinney <mdkinney@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-10-04 23:01:10 +0000 |
|---|---|---|
| committer | mdkinney <mdkinney@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-10-04 23:01:10 +0000 |
| commit | e04a8a9aae024ca64753c1106b48f20b6c417b09 (patch) | |
| tree | bd1d93ca5358099877e488f044869f543281d8d0 /Tools/Source | |
| parent | 0923e8b3b22a10416d9c8e0a192f0e88758a1b90 (diff) | |
| download | edk2-e04a8a9aae024ca64753c1106b48f20b6c417b09.zip edk2-e04a8a9aae024ca64753c1106b48f20b6c417b09.tar.gz edk2-e04a8a9aae024ca64753c1106b48f20b6c417b09.tar.bz2 | |
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
Diffstat (limited to 'Tools/Source')
| -rw-r--r-- | Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java | 17 |
1 files 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 b053bdd..99767ab 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
|