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.26234.1669845712372399118 for ; Wed, 30 Nov 2022 14:01:52 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=fzmP1OEO; 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=1669845711; 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: in-reply-to:in-reply-to:references:references; bh=H5xDTV5HSwt1hP0CSGtvWwGAdSP9nPB1+9a0fps5MzM=; b=fzmP1OEOJl2ief2rwvvhN2yVRkCOHy6bh0KjsVz4PQsC0bdozL+yyJONdeBa6qM6zCcWXD mxjkYgfg81B2Aox7nlGGQT6Hod5TwqGfOhNdMDlGBKp9lO1OCAIEze0U/gc4lNggaO/bUY 1quuTVpYlWK7mEhZMCJ+Bhk26RllBDU= Received: from mail-lj1-f197.google.com (mail-lj1-f197.google.com [209.85.208.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-196-GD2Fl_ovO7CO3F25VvzJPg-1; Wed, 30 Nov 2022 17:01:50 -0500 X-MC-Unique: GD2Fl_ovO7CO3F25VvzJPg-1 Received: by mail-lj1-f197.google.com with SMTP id g11-20020a2eb5cb000000b002799bcb5759so2902419ljn.11 for ; Wed, 30 Nov 2022 14:01:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=H5xDTV5HSwt1hP0CSGtvWwGAdSP9nPB1+9a0fps5MzM=; b=6PY0Ut8brV2xCdg+HEh7vQ1N98c5A2RzvpTgxSZpFsWDjpG08E9n1eh3Ypjcr0ybMQ cpU1dIhT0F1YVK3UahhDwby3VipQ4CdYvElWg10VqZQkeBfomguTUonuFwbopZjoRhjO ARXIg6PicBdl1FouE7q6tfFIJr1WfKONTe625qyQp9tCXK77rMnefiarhFoim8Bi4ijj M2CDJA8h1NzEiXH6vF8pMUXWKEQtXEpRuWfNw+Hk/07hiE8RsIG1PVXABcfWjPSSDwxM NMeRRrDjyUh1Aq3hjO8IAIJucOzqkCGac7BM0plPsNXoBO+zfIGDnvHldpaIyzT8Qdvk rmXQ== X-Gm-Message-State: ANoB5pkBK3YLCJZ3omidTRUMMFPEvvEQU2CEIzPS8yPNluUWym2WGk3O THu4o/lUX/SbB7MWNN/4HzDVVpI/paMj09TqiCoJZbAYpYeKXhE2w79NK8+mbJrCfft6xp+EBWU barl9vWNtwQfjz57jRjmDJuBQMc9qsw== X-Received: by 2002:a19:5e50:0:b0:4b4:f19b:c155 with SMTP id z16-20020a195e50000000b004b4f19bc155mr11885963lfi.438.1669845708415; Wed, 30 Nov 2022 14:01:48 -0800 (PST) X-Google-Smtp-Source: AA0mqf4NC1Rcqv8NyT3tMcaKTbqGBTUrU8JqYuwPe60Ely8SE/avKjb6UvVfbJ9unT7Zyqj35aabU5yb3GN7tvV+FA8= X-Received: by 2002:a19:5e50:0:b0:4b4:f19b:c155 with SMTP id z16-20020a195e50000000b004b4f19bc155mr11885947lfi.438.1669845708225; Wed, 30 Nov 2022 14:01:48 -0800 (PST) Received: from 567203818698 named unknown by gmailapi.google.com with HTTPREST; Wed, 30 Nov 2022 14:01:47 -0800 From: "Oliver Steffen" X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221130220125.1112760-1-osteffen@redhat.com> References: <20221130220125.1112760-1-osteffen@redhat.com> MIME-Version: 1.0 Date: Wed, 30 Nov 2022 14:01:47 -0800 Message-ID: Subject: [PATCH v9 10/12] .pytool: CISettings.py: don't add scopes for GCC To: 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 , Michael Kubacki , Ray Ni , Sami Mujawar , Sean Brogan , Sunil V L , Yuwei Chen , Zhiguang Liu , Pawel Polawski , Chris Fernald , Oliver Steffen X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" 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 -- 2.38.1