BaseTools: fix PLATFORM_DIR variable value for multiple workspace

when enable the multiple workspace, the PLATFORM_DIR still is
$(WORKSPACE)\AnyPkg, even though it is in a PACKAGES_PATH folder. this
patch fix this issue to use the real path.

Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py
index a4844bec73e7f6f4b2070277b905c98debe780c5..287046a5a8ac6960ce14ed520cca09717eccff92 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/GenMake.py
+++ b/BaseTools/Source/Python/AutoGen/GenMake.py
@@ -233,7 +233,7 @@ PLATFORM_NAME = ${platform_name}
 PLATFORM_GUID = ${platform_guid}\r
 PLATFORM_VERSION = ${platform_version}\r
 PLATFORM_RELATIVE_DIR = ${platform_relative_directory}\r
-PLATFORM_DIR = $(WORKSPACE)${separator}${platform_relative_directory}\r
+PLATFORM_DIR = ${platform_dir}\r
 PLATFORM_OUTPUT_DIR = ${platform_output_directory}\r
 \r
 #\r
@@ -612,6 +612,7 @@ cleanlib:
             "platform_version"          : self.PlatformInfo.Version,\r
             "platform_relative_directory": self.PlatformInfo.SourceDir,\r
             "platform_output_directory" : self.PlatformInfo.OutputDir,\r
+            "platform_dir"              : self._AutoGenObject.Macros["PLATFORM_DIR"],\r
 \r
             "module_name"               : self._AutoGenObject.Name,\r
             "module_guid"               : self._AutoGenObject.Guid,\r
@@ -989,7 +990,7 @@ PLATFORM_NAME = ${platform_name}
 PLATFORM_GUID = ${platform_guid}\r
 PLATFORM_VERSION = ${platform_version}\r
 PLATFORM_RELATIVE_DIR = ${platform_relative_directory}\r
-PLATFORM_DIR = $(WORKSPACE)${separator}${platform_relative_directory}\r
+PLATFORM_DIR = $(platform_dir)\r
 PLATFORM_OUTPUT_DIR = ${platform_output_directory}\r
 \r
 #\r
@@ -1119,6 +1120,7 @@ ${BEGIN}\t-@${create_directory_command}\n${END}\
             "platform_version"          : self.PlatformInfo.Version,\r
             "platform_relative_directory": self.PlatformInfo.SourceDir,\r
             "platform_output_directory" : self.PlatformInfo.OutputDir,\r
+            "platform_dir"              : self._AutoGenObject.Macros["PLATFORM_DIR"],\r
 \r
             "module_name"               : self._AutoGenObject.Name,\r
             "module_guid"               : self._AutoGenObject.Guid,\r
@@ -1171,7 +1173,7 @@ PLATFORM_NAME = ${platform_name}
 PLATFORM_GUID = ${platform_guid}\r
 PLATFORM_VERSION = ${platform_version}\r
 PLATFORM_FILE = ${platform_file}\r
-PLATFORM_DIR = $(WORKSPACE)${separator}${platform_relative_directory}\r
+PLATFORM_DIR = $(platform_dir)\r
 PLATFORM_OUTPUT_DIR = ${platform_output_directory}\r
 \r
 #\r
@@ -1313,6 +1315,7 @@ cleanlib:
             "platform_relative_directory": PlatformInfo.SourceDir,\r
             "platform_output_directory" : PlatformInfo.OutputDir,\r
             "platform_build_directory"  : PlatformInfo.BuildDir,\r
+            "platform_dir"              : self._AutoGenObject.Macros["PLATFORM_DIR"],\r
 \r
             "toolchain_tag"             : PlatformInfo.ToolChain,\r
             "build_target"              : PlatformInfo.BuildTarget,\r