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, 2 insertions, 2 deletions

diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py
index 0342709a3a..d9b219e1c7 100644
--- a/BaseTools/Source/Python/AutoGen/GenMake.py
+++ b/BaseTools/Source/Python/AutoGen/GenMake.py
@@ -19,7 +19,7 @@ import string
 import re

 import os.path as path

 from Common.LongFilePathSupport import OpenLongFilePath as open

-

+from Common.MultipleWorkspace import MultipleWorkspace as mws

 from Common.BuildToolError import *

 from Common.Misc import *

 from Common.String import *

@@ -559,7 +559,7 @@ cleanlib:
         found = False

         while not found and os.sep in package_rel_dir:

             index = package_rel_dir.index(os.sep)

-            current_dir = os.path.join(current_dir, package_rel_dir[:index])

+            current_dir = mws.join(current_dir, package_rel_dir[:index])

             for fl in os.listdir(current_dir):

                 if fl.endswith('.dec'):

                     found = True