diff options
| author | Pierre Gondois <Pierre.Gondois@arm.com> | 2021-09-23 16:59:00 +0800 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2021-09-29 14:31:37 +0000 |
| commit | c214128a38bd73c8a3aaad4b1522f3a89c2a5cfc (patch) | |
| tree | 09dcfcafa88e1efcb972e4a1fc6197961ebaf168 /BaseTools | |
| parent | 1ce6ceb75bc7b8c3f60c99e79a8373731d3509a4 (diff) | |
| download | edk2-c214128a38bd73c8a3aaad4b1522f3a89c2a5cfc.tar.gz edk2-c214128a38bd73c8a3aaad4b1522f3a89c2a5cfc.tar.bz2 edk2-c214128a38bd73c8a3aaad4b1522f3a89c2a5cfc.zip | |
BaseTools/GenMake: Use ToolDefinition as fallback option
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3653
Use the value set in tools_def.txt when the makefile type is
not explicitly set via BuildOption. This allows to have a
valid default makefile name instead of an empty string.
Also use GMAKE_FILETYPE instead of hard-coded "gmake".
Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
Reviewed-by: Chris Jones <christopher.jones@arm.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
Diffstat (limited to 'BaseTools')
| -rwxr-xr-x | BaseTools/Source/Python/AutoGen/GenMake.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py index 961b2ab1c3..e55efff059 100755 --- a/BaseTools/Source/Python/AutoGen/GenMake.py +++ b/BaseTools/Source/Python/AutoGen/GenMake.py @@ -2,7 +2,7 @@ # Create makefile for MS nmake and GNU make
#
# Copyright (c) 2007 - 2021, Intel Corporation. All rights reserved.<BR>
-# Copyright (c) 2020, ARM Limited. All rights reserved.<BR>
+# Copyright (c) 2020 - 2021, Arm Limited. All rights reserved.<BR>
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
@@ -177,11 +177,11 @@ class BuildFile(object): MakePath = AutoGenObject.BuildOption.get('MAKE', {}).get('PATH')
if not MakePath:
- self._FileType = ""
- elif "nmake" in MakePath:
+ MakePath = AutoGenObject.ToolDefinition.get('MAKE', {}).get('PATH')
+ if "nmake" in MakePath:
self._FileType = NMAKE_FILETYPE
else:
- self._FileType = "gmake"
+ self._FileType = GMAKE_FILETYPE
if sys.platform == "win32":
self._Platform = WIN32_PLATFORM
|