Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

BaseTools: Fix Macro Expansion on Machine Architecture for Components 

BaseTools currently does not expand macros for component architecture when
nested !include directives are used. This breaks use cases like
[Component.$(DXE_ARCH)].

The fix is to add explicit macro expansion when computing the Arch value
for component lines in DscParser.

Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
This commit is contained in:
Nate DeSimone 2025-05-05 23:41:14 -07:00 committed by Liming Gao
parent 5bc52de687
commit 43e29830ef
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
BaseTools/Source/Python/Workspace/MetaFileParser.py
View File

@ -1,7 +1,7 @@
## @file ## @file
# This file is used to parse meta files # This file is used to parse meta files
# #
# Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR> # Copyright (c) 2008 - 2025, Intel Corporation. All rights reserved.<BR>
# (C) Copyright 2015-2018 Hewlett Packard Enterprise Development LP<BR> # (C) Copyright 2015-2018 Hewlett Packard Enterprise Development LP<BR>
# SPDX-License-Identifier: BSD-2-Clause-Patent # SPDX-License-Identifier: BSD-2-Clause-Patent
# #
@ -1388,7 +1388,7 @@ class DscParser(MetaFileParser):
self._SectionsMacroDict.clear() self._SectionsMacroDict.clear()
GlobalData.gPlatformDefines = {} GlobalData.gPlatformDefines = {}
# Get all macro and PCD which has straitforward value # Get all macro and PCD which has straightforward value
self.__RetrievePcdValue() self.__RetrievePcdValue()
self._Content = self._RawTable.GetAll() self._Content = self._RawTable.GetAll()
self._ContentIndex = 0 self._ContentIndex = 0
@ -1464,7 +1464,7 @@ class DscParser(MetaFileParser):
self._ValueList[0], self._ValueList[0],
self._ValueList[1], self._ValueList[1],
self._ValueList[2], self._ValueList[2],
S1, self._Scope[0][0],
S2, S2,
S3, S3,
NewOwner, NewOwner,
@ -1711,6 +1711,7 @@ class DscParser(MetaFileParser):
def __ProcessComponent(self): def __ProcessComponent(self):
self._ValueList[0] = ReplaceMacro(self._ValueList[0], self._Macros) self._ValueList[0] = ReplaceMacro(self._ValueList[0], self._Macros)
self._Scope[0][0] = ReplaceMacro(self._Scope[0][0], self._Macros)
def __ProcessBuildOption(self): def __ProcessBuildOption(self):
self._ValueList = [ReplaceMacro(Value, self._Macros, RaiseError=False) self._ValueList = [ReplaceMacro(Value, self._Macros, RaiseError=False)