From mboxrd@z Thu Jan 1 00:00:00 1970 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 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@bsdio.com header.s=fm3 header.b=QQUjvO4J; spf=pass (domain: bsdio.com, ip: 66.111.4.27, mailfrom: rebecca@bsdio.com) 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) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Fri, 31 Mar 2023 09:48:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdio.com; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm3; t=1680270531; x= 1680356931; bh=9M1f3b2dAafIZhfe0gZl24fb/DGXJja68D5o/RhqovE=; b=Q QUjvO4JdDerzjvnGvJPJE0VtjTj//bDHleBgVNXp2YAVz1FB8st/3hcqc/fKaKXB pYQUPM98v4qvFgrUNxUW8gHa3dSzdcq79mEOltZFGq3NRXvbPuZkZHlIKFVTi761 qwE6aR969YRdsZCvCf/5DOWaLo7Ya4tRO/98CqWXdu/7v5XMGwJnpBjUVvQkaaDQ LbEV6p1IAYQPFKqhP5BVHd++n7iex1JKVSdpYsjtzGsfWUf8xC+xWyZQ/TA2Wli5 pFTOkhnHF5yCF6uNxmwgRTBnxkoElMgFJdvEEHn3Z5oee8qSPBAd8XbASFgnpUwS +3Dfr6TnEq+J8/TRVH/WQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1680270531; x= 1680356931; bh=9M1f3b2dAafIZhfe0gZl24fb/DGXJja68D5o/RhqovE=; b=W JBgAFjseFjmWykAzSARKAL1IalDO/JFb6NhvkFOU7JpTVgvOXFkt89v4fYoVYcK2 qJ0E4hNLJiC+sSPhWb+aWqXXIUn6DMraI8M7AuVS7nN4Ot2n9uZxP2bYm2HiA5Ig opuVWqUVgcFv2Z6G5NHJl8NnEsafzd0ItDizQICNPh40fLuaJRC/e201oaE97Mxp Ci43cSTplyxcmQUL6Bn3sE6aRVfUAGMw5dPPBkSCp0UQ5QWj+UkbaM/dIaGuLobf +A0xzxQKWSo3Ex4JutOKDjxjg8abwpvVNbSCj2IpSNPWNvhPJMNENTrIcHvtjxCt n/FO42VXK/ekDBj0LQVIA== 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 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: [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> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230331134845.1422257-1-rebecca@bsdio.com> References: <20230331134845.1422257-1-rebecca@bsdio.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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=clang CXX=clang++' 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 --- edk2basetools/Workspace/DscBuildData.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/edk2basetools/Workspace/DscBuildData.py b/edk2basetools/Workspace/DscBuildData.py index ff5662f35702..f6bf326018c6 100644 --- a/edk2basetools/Workspace/DscBuildData.py +++ b/edk2basetools/Workspace/DscBuildData.py @@ -89,7 +89,8 @@ def _IsFieldValueAnArray (Value): ''' WindowsCFLAGS = 'CFLAGS = $(CFLAGS) /wd4200 /wd4034 /wd4101 ' -LinuxCFLAGS = 'BUILD_CFLAGS += -Wno-pointer-to-int-cast -Wno-unused-variable ' +LinuxCFLAGS = 'CFLAGS += -Wno-pointer-to-int-cast -Wno-unused-variable ' +LinuxCFLAGS2 = 'BUILD_CFLAGS += -Wno-pointer-to-int-cast -Wno-unused-variable ' PcdMakefileEnd = ''' !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 = MakeApp + '\n' CC_FLAGS = LinuxCFLAGS + CC_FLAGS2 = LinuxCFLAGS2 if sys.platform == "win32": CC_FLAGS = WindowsCFLAGS BuildOptions = OrderedDict() @@ -2926,7 +2928,9 @@ def GenerateByteArrayValue (self, StructuredPcds): ValueList = [item for item in BuildOptions['COMMON'] if item.startswith((r"/U","-U"))] ValueList.extend([item for item in BuildOptions['COMMON'] if item.startswith((r"/D", "-D"))]) CC_FLAGS += " ".join(ValueList) + CC_FLAGS2 += " ".join(ValueList) MakeApp += CC_FLAGS + MakeApp += "\n" + CC_FLAGS2 if sys.platform == "win32": MakeApp = MakeApp + PcdMakefileEnd -- 2.34.1