Changed the way of handling not supported ARCH for a module. It should not break the build. Instead, it just give a warning message.

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

1 files changed, 6 insertions, 2 deletions

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java b/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java
index 28bfb9e..3c21c40 100644
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java
@@ -252,8 +252,9 @@ public class GenBuildTask extends Ant {
         List moduleSupportedArchs = saq.getModuleSupportedArchs();

         if (moduleSupportedArchs != null) {

             for (int k = 0; k < archList.length; k++) {

-                if ( ! moduleSupportedArchs.contains(archList[k])) {

-                    throw new BuildException("Specified architecture [" + archList[k] + "] is not supported by " + moduleId + ". The module " + moduleId + " only supports [" + moduleSupportedArchs + "] architectures.");

+                if (!moduleSupportedArchs.contains(archList[k])) {

+                    EdkLog.log(this, EdkLog.EDK_WARNING, "Specified architecture [" + archList[k] + "] is not supported by " + moduleId + ". The module " + moduleId + " only supports [" + moduleSupportedArchs + "] architectures.");

+                    archList[k] = "";

                 }

             }

         }

@@ -263,6 +264,9 @@ public class GenBuildTask extends Ant {
         }

 

         for (int k = 0; k < archList.length; k++) {

+            if (archList[k] == "") {

+                continue;

+            }

 

             getProject().setProperty("ARCH", archList[k]);