BaseTools: Update Build tool to support multiple workspaces

[mirror_edk2.git] / BaseTools / Source / Python / AutoGen / GenMake.py

diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py
index 0342709a3a6377f8c73c1f4c796d9f4bd9cf5b74..d9b219e1c75fe778f4e485289504c754885a9576 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/GenMake.py
+++ b/BaseTools/Source/Python/AutoGen/GenMake.py
@@ -19,7 +19,7 @@ import string
 import re\r
 import os.path as path\r
 from Common.LongFilePathSupport import OpenLongFilePath as open\r
-\r
+from Common.MultipleWorkspace import MultipleWorkspace as mws\r
 from Common.BuildToolError import *\r
 from Common.Misc import *\r
 from Common.String import *\r
@@ -559,7 +559,7 @@ cleanlib:
         found = False\r
         while not found and os.sep in package_rel_dir:\r
             index = package_rel_dir.index(os.sep)\r
-            current_dir = os.path.join(current_dir, package_rel_dir[:index])\r
+            current_dir = mws.join(current_dir, package_rel_dir[:index])\r
             for fl in os.listdir(current_dir):\r
                 if fl.endswith('.dec'):\r
                     found = True\r