From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (NAM12-BN8-obe.outbound.protection.outlook.com [40.107.237.82]) by mx.groups.io with SMTP id smtpd.web11.49860.1671542113224368946 for ; Tue, 20 Dec 2022 05:15:13 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@nvidia.com header.s=selector2 header.b=tiRRKj0t; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: nvidia.com, ip: 40.107.237.82, mailfrom: jake@nvidia.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W//og6/+LmAkbB6++tgmnfg8kfi7573QVq9xZpJN9XmO9nI+wQGBXZ7Krpj+pGgaN7qN1X1UVzB8YmP153TnZISG3QbNHDLkOLsyCaf09xupTxKSN38In1VbbzHbFMgt8LJJWu86wC246JuIXLXA14kLUxjVgR4BysqcqSlGnKJCb5W1xOJ6GY+t8dD8NG/O2NWox41zwH1xBiCQacaEzBMGWSi7MHgB5rng+KOFEc5Kf/AzRfBV8jEsrsIdk1hmYHvPuue0JR05oSAEUhAVYOXw8zML661ujNtZcTohMRgX2gzxUDyYDhQweSE3GVWTFxnd3wKHm4XqdPN5KJlZGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=T+LF1QcGOPADtGSBmmNNewq6M2JxJYczG4YTH+CPzxI=; b=MMkwy3AGVnUz7wuwjuTEuVF2kbi74nxVWAgqVKdGeCkVh2KGU8nCtuAHyhDJbhomBHQlui4DOEcRtCKX2p1aXLeC7HYRFawpPA/TSc/qCknGhpCdgKWtIkvEKOqFkNdP3ObDF4/p67qVMNvzsnxaNYSrqM9+0kPGEBYHwuLBMdou/8lKSIHwd3HWaseTVTDSZ/WAEXLdFAUYpn7dTFuOqhCj6QqhAsizKZdJqoz3KvPP2nfl/6YrtSPg152l49NRTkY/BnrpTK4aVnHmZuqlQ/PIjpqRIomSOnfam4VrR3kzyxdcGoVEpAD7Rr6u8f72lf2C+iw9WvX9WwgG5yYO4A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=T+LF1QcGOPADtGSBmmNNewq6M2JxJYczG4YTH+CPzxI=; b=tiRRKj0tWSrRGMqBDGhEZt0gBWSpV8437qa0ziiojxTi58bfwuBd4yemQdDoNLJx4BB180F+jZFhFIEZyjhek82/x5JLBXwJwMstL/e/MivFgVLrWAHxm+O5GQ6cya88x160x9qPy43OpNMCdDNj9oRUimeiQ8ogabRI/VpYJ8RQE2oHGd4MhvtbGEN2UaXJ9UjsX/pbA+qJdSx74pFnxp2J9vrGt4Aqe3s0X1ZIviMxnQnHZkhoBhoq4dU6z4+KeUVAVNuMG65hIvm3ZFjMx+tdHQjgICJ2m4qpFXVHqjlTrcx7tOlR9GHR4z60+oCfdRiCujnxmTZuf7zQD+I3mw== Received: from DS7PR03CA0160.namprd03.prod.outlook.com (2603:10b6:5:3b2::15) by CH2PR12MB4263.namprd12.prod.outlook.com (2603:10b6:610:a6::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.16; Tue, 20 Dec 2022 13:15:11 +0000 Received: from DM6NAM11FT025.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3b2:cafe::77) by DS7PR03CA0160.outlook.office365.com (2603:10b6:5:3b2::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.21 via Frontend Transport; Tue, 20 Dec 2022 13:15:10 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by DM6NAM11FT025.mail.protection.outlook.com (10.13.172.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.6 via Frontend Transport; Tue, 20 Dec 2022 13:15:10 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Tue, 20 Dec 2022 05:15:00 -0800 Received: from jake-vm-01.nvidia.com (10.126.231.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Tue, 20 Dec 2022 05:15:00 -0800 From: "Jake Garver" To: CC: , , , , , Jake Garver Subject: [PATCH] BaseTools: Use BUILD_CC when checking gcc version in DevicePath Date: Tue, 20 Dec 2022 08:14:12 -0500 Message-ID: <268c8606bfb6b210c932c7c8978469efaab1c2ac.1671541950.git.jake@nvidia.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Return-Path: jake@nvidia.com X-Originating-IP: [10.126.231.37] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT025:EE_|CH2PR12MB4263:EE_ X-MS-Office365-Filtering-Correlation-Id: 7829feda-68b6-464b-921f-08dae28c392f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: y1K0NZKZ+HWVD+Hs+knAZJp72/K1gCzGR8X6QM8zzvUHy/ffqTHaUBFlY3pbOnCwc+z0SfAM8SXAFSTEVnXTbVY+CCq4Jx8PctkrGjWvAJczXymG3rGECMXbSOXbsibzg0iFd0zP4kXXYORlyLt7VbmPs+WhPL1eoAM6MNLhc+nXiyl1nGtFyTjUNthuwnuHNBTNHkIhjswpZcM7XinhtKhmE9gO1ZV5R6PdFcWmtlgY43PIeAszamJbvdfU2lLkYQNdk229ZTetiW7NDDmTlxV+Ek1XJkkz++1ODzj/+/tZWXj4TSIGmLeNF1F0xoHMBwqHdDMzi8ofzcUQ33vf+3SQEvQzjUVBSjG1vzwR7updTP+ie3mUjjFTgvu2ATAXzQv61xj929+eE5H1RDlhKwLX91z8kbIfu8Vl6DeD9lp22lctDtdpuMQde9lxnoGkbm5MFDuuecdksSWOsBpNy8kvzd1yJwVbYEkiXnr3DsPULaR4sKScd9L0IZpSvtv/GxCvOBOuVbXm2H5uHq4CNomz3kn4FRzp0gQ0shJEWq4wCsNpvl7zMcy2wyhyKSQzcVEWLUQmOwaSqUnzMOiUY0IizTaoQwP7FgMBgUU8UzdV1Ut3lo3jMcdc31U9LaIZnwGCt9YkT6L1vRtgBj86GmQItY14gL9oMjfHJ7qeeZPMjK5omWcQ9vqh/uVjsZRpjn2TILcQG9Az4/snCxSQPg== X-Forefront-Antispam-Report: CIP:216.228.117.160;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge1.nvidia.com;CAT:NONE;SFS:(13230022)(4636009)(39860400002)(396003)(346002)(376002)(136003)(451199015)(46966006)(40470700004)(36840700001)(8936002)(4326008)(8676002)(70206006)(70586007)(5660300002)(41300700001)(36756003)(6916009)(82310400005)(54906003)(316002)(336012)(40460700003)(86362001)(2906002)(4744005)(6666004)(478600001)(7696005)(107886003)(40480700001)(356005)(7636003)(82740400003)(26005)(186003)(36860700001)(16526019)(47076005)(426003)(83380400001)(2616005);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Dec 2022 13:15:10.7658 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7829feda-68b6-464b-921f-08dae28c392f X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.160];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT025.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4263 Content-Type: text/plain When checking the version in DevicePath's Makefile, use BUILD_CC instead of assuming "gcc". BUILD_CC is set in header.makefile and is the compiler that will actually be used to build DevicePath. It defaults to "gcc", but may be overridden. Signed-off-by: Jake Garver --- BaseTools/Source/C/DevicePath/GNUmakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BaseTools/Source/C/DevicePath/GNUmakefile b/BaseTools/Source/C/DevicePath/GNUmakefile index 17f213879e..13b54ead65 100644 --- a/BaseTools/Source/C/DevicePath/GNUmakefile +++ b/BaseTools/Source/C/DevicePath/GNUmakefile @@ -13,7 +13,7 @@ OBJECTS = DevicePath.o UefiDevicePathLib.o DevicePathFromText.o DevicePathUtili include $(MAKEROOT)/Makefiles/app.makefile -GCCVERSION = $(shell gcc -dumpversion | awk -F'.' '{print $$1}') +GCCVERSION = $(shell $(BUILD_CC) -dumpversion | awk -F'.' '{print $$1}') ifneq ("$(GCCVERSION)", "5") ifneq ($(CXX), llvm) ifneq ($(DARWIN),Darwin) -- 2.17.1