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.web11.22827.1669838487040900123 for ; Wed, 30 Nov 2022 12:01:27 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=fDIOcbEz; 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=1669838486; 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=fDIOcbEzbUS/vx61AQd0y96Z7KlMLTPiyHr7f7GhBBQ0PldNt2b5yn/5Icepv8iU2EpWBA He3tYr/qCvKslJXdLcRdq3S2dEWIbY5o3DMXPniuHBrpZX4bdTfUzKyZAKijQRJfq9mA7o 4/nSrVZ6/5FhWmZmtVZvxVFUBtBUy6w= Received: from mail-lf1-f69.google.com (mail-lf1-f69.google.com [209.85.167.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-288-t5DM9bRHPuKaGOPlTpfUAQ-1; Wed, 30 Nov 2022 15:01:21 -0500 X-MC-Unique: t5DM9bRHPuKaGOPlTpfUAQ-1 Received: by mail-lf1-f69.google.com with SMTP id w14-20020a19490e000000b004b12aab341cso6883072lfa.11 for ; Wed, 30 Nov 2022 12:01:20 -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=aWO0qKhmPffnkLo74k2gS+lx7GM4PM7XtNAdhzpxsGSq2Vv6s3WWLcFp9kSqgqswvC +HZX6cd5u3k/R1THf0ExUL8LWX75sskrRPM3DFZuOzlq7p8uODNQ0n+360wr7iUl+dcy zIUeQouXvOwsbNeUTQBca7/TQbzaCsFoaWbERPbKQkrSsy9KWsy4NVTGuS7NFk7S4rL1 kqAZrygCWXov3FYuSx4yCWUJfEE+GzcZAWAgpP0JFJtoowZrPUBy72IrLjzy1Q10hNkY QEXWImcmEdaWCVIgPaCO3HYF8EY2mlLgzwf779mhp1yWXhQAg5YGhpHwMNRUZDLjFRJE XkYg== X-Gm-Message-State: ANoB5pmHYsyQ9QVeHcubYmve5myeY5LcZu0P8rp1LriWomThHH9GvQk7 o4UNK20B9RNMX/jkOLeGkgIEi6/fV0rsocm2OB/8kK+B+rxG5sa80qXtdm2RTZsra1zP+A0h0sc SQ8W5MGEJQzQsOWywC83g338X2lEgLg== X-Received: by 2002:ac2:4c42:0:b0:4a5:bf09:a700 with SMTP id o2-20020ac24c42000000b004a5bf09a700mr14324822lfk.656.1669838479339; Wed, 30 Nov 2022 12:01:19 -0800 (PST) X-Google-Smtp-Source: AA0mqf6tmDBzk1/1jw0X/9BxYZX+31Qsc/WWJvO+uetYZ98BBQCVvIK/IQjxYuqlC0W3bBdrfT1ilwKeT0KIpI83Cx4= X-Received: by 2002:ac2:4c42:0:b0:4a5:bf09:a700 with SMTP id o2-20020ac24c42000000b004a5bf09a700mr14324817lfk.656.1669838479156; Wed, 30 Nov 2022 12:01:19 -0800 (PST) Received: from 567203818698 named unknown by gmailapi.google.com with HTTPREST; Wed, 30 Nov 2022 12:01:18 -0800 From: "Oliver Steffen" X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221130200037.1098765-1-osteffen@redhat.com> References: <20221130200037.1098765-1-osteffen@redhat.com> MIME-Version: 1.0 Date: Wed, 30 Nov 2022 12:01:18 -0800 Message-ID: Subject: [PATCH v8 11/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