diff options
author | Yonghong Zhu <yonghong.zhu@intel.com> | 2018-02-24 21:41:13 +0800 |
---|---|---|
committer | Yonghong Zhu <yonghong.zhu@intel.com> | 2018-02-28 13:42:54 +0800 |
commit | d0cd33006906f250f184b6f873a05d15755ba0f0 (patch) | |
tree | c27389ccc3ed39df152a1c5ae1084f24122e97c8 /BaseTools | |
parent | 675e75c591b558262c8f5ea28fa2dd594db74159 (diff) | |
download | edk2-d0cd33006906f250f184b6f873a05d15755ba0f0.tar.gz edk2-d0cd33006906f250f184b6f873a05d15755ba0f0.tar.bz2 edk2-d0cd33006906f250f184b6f873a05d15755ba0f0.zip |
BaseTools:Override the MAKE_FLAGS by BuildOptions in DSC
The issue that *_*_*_MAKE_FLAGS doesn't work in DSC [BuildOptions]
section. It means MAKE flags can't be set in platform DSC file.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
(cherry picked from commit 02a908fc6d93a7971990d5fa8cd4efe023d14e43)
Diffstat (limited to 'BaseTools')
-rw-r--r-- | BaseTools/Source/Python/AutoGen/AutoGen.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py index 405bfa145a..1787decd1d 100644 --- a/BaseTools/Source/Python/AutoGen/AutoGen.py +++ b/BaseTools/Source/Python/AutoGen/AutoGen.py @@ -1907,6 +1907,13 @@ class PlatformAutoGen(AutoGen): NewOption = self.ToolDefinition["MAKE"]["FLAGS"].strip()
if NewOption != '':
self._BuildCommand += SplitOption(NewOption)
+ if "MAKE" in self.EdkIIBuildOption:
+ if "FLAGS" in self.EdkIIBuildOption["MAKE"]:
+ Flags = self.EdkIIBuildOption["MAKE"]["FLAGS"]
+ if Flags.startswith('='):
+ self._BuildCommand = [self._BuildCommand[0]] + [Flags[1:]]
+ else:
+ self._BuildCommand += [Flags]
return self._BuildCommand
## Get tool chain definition
|