From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from wout5-smtp.messagingengine.com (wout5-smtp.messagingengine.com [64.147.123.21]) by mx.groups.io with SMTP id smtpd.web11.89567.1680568383604502399 for ; Mon, 03 Apr 2023 17:33:03 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@bsdio.com header.s=fm3 header.b=gly/W4sd; spf=pass (domain: bsdio.com, ip: 64.147.123.21, mailfrom: rebecca@bsdio.com) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 6D4E23200955; Mon, 3 Apr 2023 20:33:02 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Mon, 03 Apr 2023 20:33:02 -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:message-id:mime-version:reply-to:sender:subject :subject:to:to; s=fm3; t=1680568382; x=1680654782; bh=2z3FU3ULpp wvXGO509W0H7jZuf97Zj3vNsuRI7aAFYA=; b=gly/W4sdGUGvnQgstdMQmqv1z3 or3caOo2SE9PNwIen/zKGj4rnbdhd9TXiraz0+/jUUWrVRtbMXsUu0NNonZBRA6p S+zJpUQdZpM9CiEYj+Fdn2Uw4tm4gylLuJsycGFHOg3v7FfJTOGKoLCRscflismB UodFRV5NujRnngNlXdTvu+hDceKxNQPk9T3qMP8jvyoy3KLU8nByd+CVESnBJBgu u/5GQ52gsQqYkwvM3sKx/WY0nl2434ta9yq2/RF2ktnPiwLFkJ0BpK39JHLguCz1 DBjv5XFhWx5UwLfxQXIxZfOHFVUrREPD/GM0pYaXrkPFc0VZ93z22+aQ8n/Q== 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:message-id:mime-version: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=1680568382; x=1680654782; bh=2z3FU3ULppwvX GO509W0H7jZuf97Zj3vNsuRI7aAFYA=; b=D1vEOgMQQ3rvTUXO2ZzYaYq7quAId ggFVKbZ/5SPDCmUVBVRwvYcKPYZX0bwHt70sDZFenAesyKqyLNr0SWzzGrKoluTD mjs5r8PcF/yWL5E43RpSxzvEDyRTiVCqnejP8X5dPoqMXy3L18ZdqT2WYjOpmIHA wcAC5wMmNookSwMHb7TBK3RrYCW0j7ppmAiDJU7EcVcmgW7x0Sm3ib9qjNpbO4in CcCnyS5+CbylVZRw40mW5GEOr7WM70CbJb1gYozd5x1b0EKQYjGmjMMYKlFTg8Xu Ogv+vFcPct5Rtai34TbQnAylLCRKCEpOrJngaLwuGE9yks6DR5nRgBb1w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdeikedgudekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheptfgvsggvtggt rgcuvehrrghnuceorhgvsggvtggtrgessghsughiohdrtghomheqnecuggftrfgrthhtvg hrnhepuedvkedtleekueekgfejjeettefftdduiefffeehveefgfevueelgffhleelgfdv necuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheprhgvsg gvtggtrgessghsughiohdrtghomh X-ME-Proxy: Feedback-ID: i5b994698:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 3 Apr 2023 20:33:00 -0400 (EDT) From: "Rebecca Cran" To: devel@edk2.groups.io, Liming Gao , Yuwei Chen , Michael D Kinney Cc: Rebecca Cran Subject: [PATCH edk2-basetools 1/1] DscBuildData.py: set CC_FLAGS2 when running on Windows Date: Mon, 3 Apr 2023 18:32:56 -0600 Message-Id: <20230404003256.2210620-1-rebecca@bsdio.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit CC_FLAGS2 also needs to be set when running on Windows, otherwise the wrong line is added and nmake fails when building using Visual Studio. Signed-off-by: Rebecca Cran --- edk2basetools/Workspace/DscBuildData.py | 1 + 1 file changed, 1 insertion(+) diff --git a/edk2basetools/Workspace/DscBuildData.py b/edk2basetools/Workspace/DscBuildData.py index f6bf326018c6..8c402e189090 100644 --- a/edk2basetools/Workspace/DscBuildData.py +++ b/edk2basetools/Workspace/DscBuildData.py @@ -2895,6 +2895,7 @@ def GenerateByteArrayValue (self, StructuredPcds): CC_FLAGS2 = LinuxCFLAGS2 if sys.platform == "win32": CC_FLAGS = WindowsCFLAGS + CC_FLAGS2 = WindowsCFLAGS BuildOptions = OrderedDict() for Options in self.BuildOptions: if Options[2] != EDKII_NAME: -- 2.34.1