Use common cc flags for building PcdValueInit. The common
cc flags include the cc flag which is under common Arch and
under all build Arches.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Bob Feng <bob.c.f...@intel.com>
Cc: Liming Gao <liming....@intel.com>
---
.../Source/Python/Workspace/DscBuildData.py | 48 +++++++++----------
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py
b/BaseTools/Source/Python/Workspace/DscBuildData.py
index 6d596b2b54..4807fff489 100644
--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
@@ -2298,38 +2298,38 @@ class DscBuildData(PlatformBuildClassObject):
if Family and Family != self.ToolChainFamily:
continue
Target, Tag, Arch, Tool, Attr = Options[1].split("_")
if Tool != 'CC':
continue
-
+ if Attr != "FLAGS":
+ continue
if Target == "*" or Target == self._Target:
if Tag == "*" or Tag == self._Toolchain:
+ if 'COMMON' not in BuildOptions:
+ BuildOptions['COMMON'] = set()
if Arch == "*":
- if Tool not in BuildOptions:
- BuildOptions[Tool] = OrderedDict()
- if Attr != "FLAGS" or Attr not in BuildOptions[Tool]
or self.BuildOptions[Options].startswith('='):
- BuildOptions[Tool][Attr] =
self.BuildOptions[Options]
- else:
- # append options for the same tool except PATH
- if Attr != 'PATH':
- BuildOptions[Tool][Attr] += " " +
self.BuildOptions[Options]
- else:
- BuildOptions[Tool][Attr] =
self.BuildOptions[Options]
+ BuildOptions['COMMON'].add(self.BuildOptions[Options])
+ if Arch in self.SupArchList:
+ if Arch not in BuildOptions:
+ BuildOptions[Arch] = set()
+ BuildOptions[Arch].add(self.BuildOptions[Options])
+
if BuildOptions:
- for Tool in BuildOptions:
- for Attr in BuildOptions[Tool]:
- if Attr == "FLAGS":
- Value = BuildOptions[Tool][Attr]
- ValueList = Value.split()
- if ValueList:
- for Id, Item in enumerate(ValueList):
- if Item in ['-D', '/D', '-U', '/U']:
- CC_FLAGS += ' ' + Item
- if Id + 1 < len(ValueList):
- CC_FLAGS += ' ' + ValueList[Id + 1]
- elif Item.startswith(('-D', '/D', '-U', '/U')):
- CC_FLAGS += ' ' + Item
+ ArchBuildOptions = {arch:flags for arch,flags in
BuildOptions.items() if arch != 'COMMON'}
+ if len(ArchBuildOptions.keys()) == 1:
+ BuildOptions['COMMON'] |= (ArchBuildOptions.values()[0])
+ else:
+ CommonBuildOptions = reduce(lambda x,y: x&y,
ArchBuildOptions.values())
+ BuildOptions['COMMON'] |= CommonBuildOptions
+ ValueList = list(BuildOptions['COMMON'])
+ for Id, Item in enumerate(ValueList):
+ if Item in ['-D', '/D', '-U', '/U']:
+ CC_FLAGS += ' ' + Item
+ if Id + 1 < len(ValueList):
+ CC_FLAGS += ' ' + ValueList[Id + 1]
+ elif Item.startswith(('-D', '/D', '-U', '/U')):
+ CC_FLAGS += ' ' + Item
MakeApp += CC_FLAGS
if sys.platform == "win32":
MakeApp = MakeApp + PcdMakefileEnd
MakeApp = MakeApp + AppTarget % ("""\tcopy $(APPLICATION)
$(APPFILE) /y """)
--
2.18.0.windows.1
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
