From nobody Tue Feb 10 04:15:00 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+81021+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+81021+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1632387552; cv=none; d=zohomail.com; s=zohoarc; b=WhNzYmbkYsUyx52m8p1xdYMdbq+wMXef1KXTEdJQNrpIdFDdhwuqGysTIaQP7pAsH9TvR8ocykM8ZeSuspMBLVjz4E0XaD3aENxCrxEfBLhpLu8SiKimcVtgtmKxSldPJfx984aR+2wJHQQjQnM/2/KZcaRqI0JS4pVUqwUGqLA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632387552; h=Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=RwzDRwx/LBSlPAoy0ei6fUWDvL1UJWjRboDAIEA8/Qs=; b=DA5zTqWxK7gibGdsSA6Z2T2R2sZacjEFSD7AfwNVr/hgq9e2a6N+8y+R44WvgDenyjsfongOT/sZfy54D6zCvPZI/yrFnmrLm4hBNTfi/4x2s02jh9pByVpaKF/S9iuYnLx4X8I1kZVxZ1WDXobzjKgKSTHOZzh7KdckADUxOA8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+81021+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1632387552225307.36512763453084; Thu, 23 Sep 2021 01:59:12 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id A8Q9YY1788612x14JjNnKQTa; Thu, 23 Sep 2021 01:59:11 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web12.1964.1632387550891541804 for ; Thu, 23 Sep 2021 01:59:11 -0700 X-Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 51FA4113E; Thu, 23 Sep 2021 01:59:10 -0700 (PDT) X-Received: from e120189.arm.com (unknown [10.57.87.27]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 2E81E3F59C; Thu, 23 Sep 2021 01:59:09 -0700 (PDT) From: "PierreGondois" To: devel@edk2.groups.io, Bob Feng , Liming Gao , Sami Mujawar Subject: [edk2-devel] [PATCH v1 1/4] BaseTools/GenMake: Use ToolDefinition as fallback option Date: Thu, 23 Sep 2021 09:59:00 +0100 Message-Id: <20210923085903.15966-2-Pierre.Gondois@arm.com> In-Reply-To: <20210923085903.15966-1-Pierre.Gondois@arm.com> References: <20210923085903.15966-1-Pierre.Gondois@arm.com> Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,pierre.gondois@arm.com X-Gm-Message-State: febbPzQKQLXws2cW1pjVhmWfx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1632387551; bh=6UceIWx1fYSFYcGbq2mqZSr0gxNgg5ckIZco43L6ynk=; h=Date:From:Reply-To:Subject:To; b=ofGGmFoPQJT3obAoSuoUvWVR2rCYRwq2TxzZ3bSHDAhm22EYuLv/7YPCYrrN8MH8exy AyE70eP3n9yZ34RtwBUsidCYpEtzMM3d3pCa7fH4uiP7jjySmeNffhyEFBqJl5LXbbbjH RNnZoIU2L5dqseamqcqnjGCb7ys/yDJcUGs= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1632387553810100004 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Pierre Gondois 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 --- BaseTools/Source/Python/AutoGen/GenMake.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/= Python/AutoGen/GenMake.py index 961b2ab1c399..e55efff059f9 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.
-# Copyright (c) 2020, ARM Limited. All rights reserved.
+# Copyright (c) 2020 - 2021, Arm Limited. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent # =20 @@ -177,11 +177,11 @@ class BuildFile(object): =20 MakePath =3D AutoGenObject.BuildOption.get('MAKE', {}).get('PATH') if not MakePath: - self._FileType =3D "" - elif "nmake" in MakePath: + MakePath =3D AutoGenObject.ToolDefinition.get('MAKE', {}).get(= 'PATH') + if "nmake" in MakePath: self._FileType =3D NMAKE_FILETYPE else: - self._FileType =3D "gmake" + self._FileType =3D GMAKE_FILETYPE =20 if sys.platform =3D=3D "win32": self._Platform =3D WIN32_PLATFORM --=20 2.17.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#81021): https://edk2.groups.io/g/devel/message/81021 Mute This Topic: https://groups.io/mt/85809768/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-