From: bbahnsen <bbahnsen@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Fri, 9 Jun 2006 17:07:09 +0000 (+0000)
Subject: Temporary workaround--determine the target architecture from an environment variable... 
X-Git-Tag: edk2-stable201903~25287
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=8742c000dc639af1d7eb49b5791315298869d191

Temporary workaround--determine the target architecture from an environment variable ARCH. Optionally, you can set the variable to IA32, X64 or IPF so that the correct GenFvImage will be called.

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

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFvImageTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFvImageTask.java
index 1f5e4ecf6d..f9340758b3 100644
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFvImageTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFvImageTask.java
@@ -56,17 +56,24 @@ public class GenFvImageTask extends Task implements EfiDefine{
             path = path + File.separatorChar;
         }
         
-        if (arch.equalsIgnoreCase("")){
-            command = path + "GenFvImage";
+        // FIXME arch should be passed via schema attributes.
+        arch=System.getenv("ARCH");
+        if (arch == null) {
+          arch = "";
         }
-        if (arch.equalsIgnoreCase("ia32")){
-            command = path + "GenFvImage_IA32";
+        // FIXME end
+
+        if (arch.equalsIgnoreCase("IA32")){
+            command = path + "GenFvImage_Ia32";
         }   
-        if (arch.equalsIgnoreCase("x64")){
+        else if (arch.equalsIgnoreCase("X64")){
             command = path + "GenFvImage_X64";
         }
-        if (arch.equalsIgnoreCase("ipf")){
-            command = path + "GenFvImage_IPF";
+        else if (arch.equalsIgnoreCase("IPF")){
+            command = path + "GenFvImage_Ipf";
+        }
+        else {
+            command = path + "GenFvImage";
         }
         String argument = infFile;
         
@@ -151,4 +158,4 @@ public class GenFvImageTask extends Task implements EfiDefine{
     public void setArch(String arch) {
         this.arch = arch;
     }   
-}
\ No newline at end of file
+}