tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix EDKT117. If SupArchList is not specified, then build the module with all current toolchain supported ARCHs. 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1001 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
wuyizhong 2006-07-14 07:07:11 +00:00
parent 70edbc34be
commit ae20899810
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
View File

@ -41,7 +41,6 @@ import org.tianocore.build.id.ModuleIdentification;
import org.tianocore.build.id.PlatformIdentification; import org.tianocore.build.id.PlatformIdentification;
import org.tianocore.build.pcd.action.ActionMessage; import org.tianocore.build.pcd.action.ActionMessage;
import org.tianocore.build.pcd.action.CollectPCDAction; import org.tianocore.build.pcd.action.CollectPCDAction;
import org.tianocore.build.pcd.exception.EntityException;
import org.tianocore.build.toolchain.ToolChainAttribute; import org.tianocore.build.toolchain.ToolChainAttribute;
import org.tianocore.build.toolchain.ToolChainElement; import org.tianocore.build.toolchain.ToolChainElement;
import org.tianocore.build.toolchain.ToolChainMap; import org.tianocore.build.toolchain.ToolChainMap;

36
Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
View File

@ -1316,7 +1316,9 @@ public class SurfaceAreaQuery {
// //
// Get Fpd SA Module attribute and create FpdMoudleIdentification. // Get Fpd SA Module attribute and create FpdMoudleIdentification.
// //
arch = moduleSA.getSupArchList().toString(); if (moduleSA.getSupArchList() != null) {
arch = moduleSA.getSupArchList().toString();
}
// TBD // TBD
fvBinding = null; fvBinding = null;
@ -1342,21 +1344,25 @@ public class SurfaceAreaQuery {
// Create FpdModule Identification which have class member of module // Create FpdModule Identification which have class member of module
// identification // identification
// //
if (arch != null) { String[] archList = new String[0];
String[] archList = arch.split(" "); if (arch == null || arch.trim().length() == 0) {
for (int j = 0; j < archList.length; j++) { archList = GlobalData.getToolChainInfo().getArchs();
FpdModuleIdentification fpdSaId = new FpdModuleIdentification(saId, archList[j]); }
else{
if (fvBinding != null) { archList = arch.split(" ");
fpdSaId.setFvBinding(fvBinding); }
} for (int j = 0; j < archList.length; j++) {
FpdModuleIdentification fpdSaId = new FpdModuleIdentification(saId, archList[j]);
//
// Put element to Map<FpdModuleIdentification, Map<String, if (fvBinding != null) {
// Object>>. fpdSaId.setFvBinding(fvBinding);
//
fpdModuleMap.put(fpdSaId, ObjectMap);
} }
//
// Put element to Map<FpdModuleIdentification, Map<String,
// Object>>.
//
fpdModuleMap.put(fpdSaId, ObjectMap);
} }
} }
return fpdModuleMap; return fpdModuleMap;