From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web10.173737.1673890904381193563 for ; Mon, 16 Jan 2023 09:41:44 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ZmH5CH52; spf=pass (domain: redhat.com, ip: 170.10.133.124, mailfrom: osteffen@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673890903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=I0k5rfGVN4zj0XuZB3DkcZ8DIGctv166Wl3Uec9mmq8=; b=ZmH5CH52jzae8DQsqMB3Dkvm31VbL4uG+yGLEjkYfDsCBO06C8l2BbwWWxLZYBBbCNPvRV LenMEMl0dWiP4lszFzuIzex/kuUwv6hHaNthmcJ1vcpYmH+YWK6Hzpfe9p/a1gf5C28eBl zykQ8I6bWvEnSpjLD/ZaPYJ9UuG0QBc= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-652-EPHVBnpoOeaaWYV-iqvJ-w-1; Mon, 16 Jan 2023 12:41:42 -0500 X-MC-Unique: EPHVBnpoOeaaWYV-iqvJ-w-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D6C6D3C0F676; Mon, 16 Jan 2023 17:41:41 +0000 (UTC) Received: from osteffen-laptop.redhat.com (unknown [10.39.192.49]) by smtp.corp.redhat.com (Postfix) with ESMTP id C2222C15BA0; Mon, 16 Jan 2023 17:41:38 +0000 (UTC) From: "Oliver Steffen" To: devel@edk2.groups.io Cc: Andrew Fish , Ard Biesheuvel , Bob Feng , Dandan Bi , Gerd Hoffmann , Jian J Wang , Jiewen Yao , Jordan Justen , Leif Lindholm , Liming Gao , Michael D Kinney , Michael Kubacki , Ray Ni , Sami Mujawar , Sean Brogan , Yuwei Chen , Pawel Polawski , chris.fernald@outlook.com, Oliver Steffen , Michael Kubacki Subject: [PATCH v11 11/17] .pytool: CISettings.py: don't add scopes for GCC Date: Mon, 16 Jan 2023 18:40:38 +0100 Message-Id: <20230116174044.3346383-12-osteffen@redhat.com> In-Reply-To: <20230116174044.3346383-1-osteffen@redhat.com> References: <20230116174044.3346383-1-osteffen@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 Reviewed-by: Michael Kubacki --- .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 -- 2.39.0