Fix a bug on GenBuild and have a minor update on BuildMacro.xml

[mirror_edk2.git] / Tools / Source / GenBuild / org / tianocore / build / ExpandTask.java

diff --git a/Tools/Source/GenBuild/org/tianocore/build/ExpandTask.java b/Tools/Source/GenBuild/org/tianocore/build/ExpandTask.java
index d3df8cf7a660f153acc1138741b1e7c1adafb1b3..c4c53e04b9346f232b706d5e6db72a8cda6b9116 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/ExpandTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/ExpandTask.java
@@ -40,11 +40,13 @@ public class ExpandTask extends Task {
       Set <code>LIBS</code> for further build usage. \r
     **/\r
     public void execute() throws BuildException {\r
-        \r
-        String[] libraries = GlobalData.getModuleLibrary(getProject().getProperty("BASE_NAME"));\r
+        String basename = getProject().getProperty("BASE_NAME");\r
+        String arch = getProject().getProperty("ARCH");\r
+        arch = arch.toUpperCase();\r
+        String[] libraries = GlobalData.getModuleLibrary(basename, arch);\r
         String str = "";\r
         for (int i = 0; i < libraries.length; i ++){\r
-            str += " " + GlobalData.getLibrary(libraries[i]);\r
+            str += " " + GlobalData.getLibrary(libraries[i], arch);\r
         }\r
         getProject().setProperty("LIBS", str);\r
        \r