From nobody Wed May 15 17:46:26 2024 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+102311+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+102311+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1680270533; cv=none; d=zohomail.com; s=zohoarc; b=m76I0FmU29WWiFXj8QNnbV392qWUA/OHM5VThfGYmzmzcdlNCSsMHmy1fDZFYR1Hk/q6JT5w7Ey7rhLc7JO1jF8m9Nzn4acO4rFrafAwS/9r2TwLpRJXbvCzu1Irktqj9K6n1LqFxm8+6BE8gxerRtaLrPlGrw/7/GTNL+iKU/0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680270533; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=y0ug1pRTi79p0cCBpne+slI+9ylEFmeOo4WcIzf/mpo=; b=RspTNfKX3Q0/1RKBtaKGPUs4+Ss2dKFido755aV831w7+YU44ON1lbvbDpsmxBUXxvcJMmBGO+PE3ccO9rW8rKY4TVPjo3D0FA8yrsOcinJgW4Eqx4NCy/jLSO9IlbSzIeb0MiH3NdwhF02XVjYUM5PCeyqIvU4Y+mvjjUz3HUE= 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+102311+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1680270533553769.7106462103526; Fri, 31 Mar 2023 06:48:53 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 4mGpYY1788612xS91GEEHXzj; Fri, 31 Mar 2023 06:48:53 -0700 X-Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by mx.groups.io with SMTP id smtpd.web11.55021.1680270532498566393 for ; Fri, 31 Mar 2023 06:48:52 -0700 X-Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id BDF1D5C015A; Fri, 31 Mar 2023 09:48:51 -0400 (EDT) X-Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Fri, 31 Mar 2023 09:48:51 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdeiuddgieehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheptfgvsggv tggtrgcuvehrrghnuceorhgvsggvtggtrgessghsughiohdrtghomheqnecuggftrfgrth htvghrnhepgeffueeuledvgefgvddvgfetvdduhfefkedukeeikedtudekfeetteeifedv leefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheprh gvsggvtggtrgessghsughiohdrtghomh X-ME-Proxy: Feedback-ID: i5b994698:Fastmail X-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 31 Mar 2023 09:48:50 -0400 (EDT) From: "Rebecca Cran" To: devel@edk2.groups.io, Bret Barkelew , Sean Brogan , Chris Fernald , Bob Feng , Michael Kubacki , Oliver Steffen , Liming Gao Cc: Rebecca Cran Subject: [edk2-devel] [PATCH edk2-basetools v2 1/1] Change BUILD_CFLAGS to CFLAGS to match edk2 BaseTools change Date: Fri, 31 Mar 2023 07:48:45 -0600 Message-Id: <20230331134845.1422257-2-rebecca@bsdio.com> In-Reply-To: <20230331134845.1422257-1-rebecca@bsdio.com> References: <20230331134845.1422257-1-rebecca@bsdio.com> MIME-Version: 1.0 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,rebecca@bsdio.com X-Gm-Message-State: TU4ImeCSF723wnoCqWTNCW7bx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1680270533; bh=zwUOiysSpn8SW/wsEKH+iSIn9QmeOzzig9/6YKMAh1w=; h=Cc:Date:From:Reply-To:Subject:To; b=mahKswc5RbnU5JrrjKI0F3RAVzgx8T+v6HLGAgG41+WN2KRda/y+9dlIZmbJTNf6rCd 85u+QltXzBOgG4w9Uc4T1I/+80C+4ZDaVgIB0nTiCRioMhXhAd0blutGWRed8vQCN/Vya 1VzuFE+6TJlD+uXAbFJvEk+I5Vq2ERp47f0= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1680270534061100003 Content-Type: text/plain; charset="utf-8" In order to support building BaseTools using non-default compilers, a change is being made in the edk2 BaseTools directory to remove the 'BUILD_' prefix to CC, CXX, CFLAGS etc. so developers can for example run 'make CC=3Dclang CXX=3Dclang++' to build using clang. Update DscBuildData.py to generate Makefiles with both BUILD_CFLAGS and CFLAGS for compatibility until everyone is using a version of edk2 that expects CFLAGS. Signed-off-by: Rebecca Cran Reviewed-by: Michael D Kinney --- edk2basetools/Workspace/DscBuildData.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/edk2basetools/Workspace/DscBuildData.py b/edk2basetools/Worksp= ace/DscBuildData.py index ff5662f35702..f6bf326018c6 100644 --- a/edk2basetools/Workspace/DscBuildData.py +++ b/edk2basetools/Workspace/DscBuildData.py @@ -89,7 +89,8 @@ def _IsFieldValueAnArray (Value): ''' =20 WindowsCFLAGS =3D 'CFLAGS =3D $(CFLAGS) /wd4200 /wd4034 /wd4101 ' -LinuxCFLAGS =3D 'BUILD_CFLAGS +=3D -Wno-pointer-to-int-cast -Wno-unused-va= riable ' +LinuxCFLAGS =3D 'CFLAGS +=3D -Wno-pointer-to-int-cast -Wno-unused-variable= ' +LinuxCFLAGS2 =3D 'BUILD_CFLAGS +=3D -Wno-pointer-to-int-cast -Wno-unused-v= ariable ' PcdMakefileEnd =3D ''' !INCLUDE $(BASE_TOOLS_PATH)\Source\C\Makefiles\ms.common !INCLUDE $(BASE_TOOLS_PATH)\Source\C\Makefiles\ms.app @@ -2891,6 +2892,7 @@ def GenerateByteArrayValue (self, StructuredPcds): MakeApp =3D MakeApp + '\n' =20 CC_FLAGS =3D LinuxCFLAGS + CC_FLAGS2 =3D LinuxCFLAGS2 if sys.platform =3D=3D "win32": CC_FLAGS =3D WindowsCFLAGS BuildOptions =3D OrderedDict() @@ -2926,7 +2928,9 @@ def GenerateByteArrayValue (self, StructuredPcds): ValueList =3D [item for item in BuildOptions['COMMON'] if item= .startswith((r"/U","-U"))] ValueList.extend([item for item in BuildOptions['COMMON'] if i= tem.startswith((r"/D", "-D"))]) CC_FLAGS +=3D " ".join(ValueList) + CC_FLAGS2 +=3D " ".join(ValueList) MakeApp +=3D CC_FLAGS + MakeApp +=3D "\n" + CC_FLAGS2 =20 if sys.platform =3D=3D "win32": MakeApp =3D MakeApp + PcdMakefileEnd --=20 2.34.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 (#102311): https://edk2.groups.io/g/devel/message/102311 Mute This Topic: https://groups.io/mt/97973452/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-