Update BaseTools from main trunk r18767.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jeff Fan <jeff.fan@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/branches/UDK2015@18784 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 3 insertions, 1 deletions

diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
index 04bbc300ce..5bdc1b8288 100644
--- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
+++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
@@ -31,6 +31,7 @@ from AutoGen.BuildEngine import BuildRule
 import Common.DataType as DataType

 from Common.Misc import PathClass

 from Common.LongFilePathSupport import OpenLongFilePath as open

+from Common.MultipleWorkspace import MultipleWorkspace as mws

 

 ## Global variables

 #

@@ -322,12 +323,13 @@ class GenFdsGlobalVariable:
     #   @param  String           String that may contain macro

     #

     def ReplaceWorkspaceMacro(String):

+        String = mws.handleWsMacro(String)

         Str = String.replace('$(WORKSPACE)', GenFdsGlobalVariable.WorkSpaceDir)

         if os.path.exists(Str):

             if not os.path.isabs(Str):

                 Str = os.path.abspath(Str)

         else:

-            Str = os.path.join(GenFdsGlobalVariable.WorkSpaceDir, String)

+            Str = mws.join(GenFdsGlobalVariable.WorkSpaceDir, String)

         return os.path.normpath(Str)

 

     ## Check if the input files are newer than output files