Received: by 2002:ac0:a582:0:0:0:0:0 with SMTP id m2-v6csp889959imm; Fri, 5 Oct 2018 13:41:30 -0700 (PDT) X-Google-Smtp-Source: ACcGV62IRuIu31083klb2b3Tk3vISfYvDr/l+8kycftDKftZmZYCWghHLTilqUr52aZoX+YdjIuh X-Received: by 2002:a17:902:b712:: with SMTP id d18-v6mr13194614pls.53.1538772090456; Fri, 05 Oct 2018 13:41:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538772090; cv=none; d=google.com; s=arc-20160816; b=ObeKh+TCkvheiNCSDakD2DmHQhX516NGKLiRs5viAfp/DLXFRb2oPWOpR/GO6CDSdF 3mTu6hk9z6MVAixXfeRaGnysL30MxuhZFPtTfJ7ADDXEwvOwF8xtcYrz++ohZmcCnRXI j60t6Q4k0nrfi9UWZDestGBonOJYbmS0BjS+n0Yiy18DJ+QU9Hn7peg6ZfqhuwMV5k8T hx56rHDtW2JNTwRewirAsbjzaPbqNQs2jEa6JffObZK/AtKIRLbQZsTrFwW9UAOYNLBw tXBpvfaoSqai+M3HEyJ1M1KXyvomU1q10/iytjcmAday+8yxUaOkZ/rn6Nttqr3pIszF AgxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=3uPSjpAD08X5SMV7I7Oxma2ERgGRulshKTj7ZxZrIwg=; b=fpmyapw7zcnlcsGs6Y/i7GQqGiCjvnmbBeRyskUt3nWu2LAyRbqBt/inkeQaHp4h6n 0KPDSHPd6wYfke6XcNt8xC0j8T7LtrBo61ePF5Idws/dXQ8CW3jtA5Kr0pvyGO6kwqOr 1oNOQ+CvMaVDwns7JLhWu190jnVpUUtr9yZipjqxhU+8l2LMDIYDKQVPnNnRNpJknZTG YprVkNFigr535CGnwQ0Nwnl4ivh3tIANWFcMXyraqFFqD8X2knkgLUf8LoSlda08dHkv KFlITLNlycQ6+f3KdjiB3axus2268lNHbHOr4x0FRh12e10ZnPf9mIigwcURSpsKC+v+ 7kIw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d11-v6si9149224pgd.342.2018.10.05.13.41.15; Fri, 05 Oct 2018 13:41:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729120AbeJFDl2 (ORCPT + 99 others); Fri, 5 Oct 2018 23:41:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58636 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728451AbeJFDl1 (ORCPT ); Fri, 5 Oct 2018 23:41:27 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1B5FE30001F0; Fri, 5 Oct 2018 20:41:05 +0000 (UTC) Received: from localhost (ovpn-117-52.phx2.redhat.com [10.3.117.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9AFCB6249C; Fri, 5 Oct 2018 20:41:03 +0000 (UTC) From: Eduardo Habkost To: Arnaldo Carvalho de Melo Cc: linux-kernel@vger.kernel.org Subject: [PATCH 2/2] perf: More portable way to make CFLAGS work with clang Date: Fri, 5 Oct 2018 17:40:58 -0300 Message-Id: <20181005204058.7966-3-ehabkost@redhat.com> In-Reply-To: <20181005204058.7966-1-ehabkost@redhat.com> References: <20181005204058.7966-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Fri, 05 Oct 2018 20:41:05 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The existing code that tries to make CFLAGS compatible with clang doesn't work with Python 3. Instead of trying to touch _sysconfigdata.build_time_vars directly, change the dictionary returned by disutils.sysconfig.get_config_vars(). This works on both Python 2 and Python 3. Signed-off-by: Eduardo Habkost --- tools/perf/util/setup.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/tools/perf/util/setup.py b/tools/perf/util/setup.py index 261a55e7e1b2..63f758c655d5 100644 --- a/tools/perf/util/setup.py +++ b/tools/perf/util/setup.py @@ -9,12 +9,14 @@ def clang_has_option(option): cc = getenv("CC") if cc == "clang": - from _sysconfigdata import build_time_vars - build_time_vars["CFLAGS"] = sub("-specs=[^ ]+", "", build_time_vars["CFLAGS"]) - if not clang_has_option("-mcet"): - build_time_vars["CFLAGS"] = sub("-mcet", "", build_time_vars["CFLAGS"]) - if not clang_has_option("-fcf-protection"): - build_time_vars["CFLAGS"] = sub("-fcf-protection", "", build_time_vars["CFLAGS"]) + from distutils.sysconfig import get_config_vars + vars = get_config_vars() + for var in ('CFLAGS', 'OPT'): + vars[var] = sub("-specs=[^ ]+", "", vars[var]) + if not clang_has_option("-mcet"): + vars[var] = sub("-mcet", "", vars[var]) + if not clang_has_option("-fcf-protection"): + vars[var] = sub("-fcf-protection", "", vars[var]) from distutils.core import setup, Extension -- 2.18.0.rc1.1.g3f1ff2140