From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mx.groups.io with SMTP id smtpd.web10.29440.1669852945293907471 for ; Wed, 30 Nov 2022 16:02:25 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=ap9pnLKZ; spf=pass (domain: linux.microsoft.com, ip: 13.77.154.182, mailfrom: mikuback@linux.microsoft.com) Received: from [192.168.4.22] (unknown [47.201.8.94]) by linux.microsoft.com (Postfix) with ESMTPSA id B4AAD20B83C2; Wed, 30 Nov 2022 16:02:22 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com B4AAD20B83C2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1669852944; bh=J9IyLEXKTLoMSTLQIMhtpmXJCdNdnLbn4aKf9dy3fJU=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=ap9pnLKZjodH6CXn8nsi3Q2dm0jMpEacN1QcgLoGwOM/7yHHBwWxzhaD0FPf60jtF cM3P/G/L4fbTpgy2WFQNqmPfjsLcKa4WeQtA1f4Jx94alT9kSagc1J1h0wMr9b85AV UlTaAtZwk3Vu+FTL/Xwkk48K7J9B5xiF1JFfo8pQ= Message-ID: Date: Wed, 30 Nov 2022 19:02:21 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.13.1 Subject: Re: [PATCH v9 10/12] .pytool: CISettings.py: don't add scopes for GCC To: Oliver Steffen , devel@edk2.groups.io Cc: Andrew Fish , Ard Biesheuvel , Bob Feng , Daniel Schaefer , Gerd Hoffmann , Jiewen Yao , Jordan Justen , Leif Lindholm , Liming Gao , Michael D Kinney , Ray Ni , Sami Mujawar , Sean Brogan , Sunil V L , Yuwei Chen , Zhiguang Liu , Pawel Polawski , Chris Fernald References: <20221130220125.1112760-1-osteffen@redhat.com> From: "Michael Kubacki" In-Reply-To: Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Not a big deal but I think it would be cleaner to remove the scopes in a commit before the ext_dep files are actually removed. For the changes in this patch: Reviewed-by: Michael Kubacki On 11/30/2022 5:01 PM, Oliver Steffen wrote: > All ext_dep.yml files for gcc have been removed and gcc > is expected to be installed on the system (GCC5_*_PREFIX > may indicate the location). > No need to adjust the toolchain scopes for Linux builds > anymore. > > Signed-off-by: Oliver Steffen > --- > .pytool/CISettings.py | 9 --------- > 1 file changed, 9 deletions(-) > > diff --git a/.pytool/CISettings.py b/.pytool/CISettings.py > index 76ac2b09dba6..d87c8e838e61 100644 > --- a/.pytool/CISettings.py > +++ b/.pytool/CISettings.py > @@ -169,15 +169,6 @@ class Settings(CiBuildSettingsManager, > UpdateSettingsManager, SetupSettingsManag > else: > logging.warning("Falling back to using in-tree BaseTools") > > - if is_linux and self.ActualToolChainTag.upper().startswith("GCC"): > - if "AARCH64" in self.ActualArchitectures: > - scopes += ("gcc_aarch64_linux",) > - if "ARM" in self.ActualArchitectures: > - scopes += ("gcc_arm_linux",) > - if "RISCV64" in self.ActualArchitectures: > - scopes += ("gcc_riscv64_unknown",) > - if "LOONGARCH64" in self.ActualArchitectures: > - scopes += ("gcc_loongarch64_unknown_linux",) > self.ActualScopes = scopes > return self.ActualScopes >