X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FJava%2FSource%2FGenBuild%2Forg%2Ftianocore%2Fbuild%2FGenBuildTask.java;h=9a847172f8f0ecfd17f3bc48248db1e34e209dca;hp=7ce975a60ad3a94b2064db1e689d9a55a57d3f65;hb=c639781ef01dcfa4a66ac00cc0eb79bb34ef911b;hpb=fd6c41f5e24655889c4d2b33f1fb29e318ee3c82

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java b/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java
index 7ce975a60a..9a847172f8 100644
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java
@@ -543,6 +543,28 @@ public class GenBuildTask extends Ant {
             } else {
                 getProject().setProperty(cmd[m] + "_DPATH", "");
             }
+            
+            //
+            // Set CC_LIBPATH
+            //
+            key[4] = ToolDefinitions.TOOLS_DEF_ATTRIBUTE_LIBPATH;
+            String libpath = GlobalData.getCommandSetting(key, fpdModuleId);
+            if (libpath != null) {
+                getProject().setProperty(cmd[m] + "_LIBPATH", libpath.replaceAll("(\\\\)", "/"));
+            } else {
+                getProject().setProperty(cmd[m] + "_LIBPATH", "");
+            }
+            
+            //
+            // Set CC_INCLUDEPATH
+            //
+            key[4] = ToolDefinitions.TOOLS_DEF_ATTRIBUTE_INCLUDEPATH;
+            String includepath = GlobalData.getCommandSetting(key, fpdModuleId);
+            if (dpath != null) {
+                getProject().setProperty(cmd[m] + "_INCLUDEPATH", includepath.replaceAll("(\\\\)", "/"));
+            } else {
+                getProject().setProperty(cmd[m] + "_INCLUDEPATH", "");
+            }
         }
     }