Commit 8b2f245f authored Oct 05, 2018 by Eduardo Habkost Committed by Arnaldo Carvalho de Melo Oct 08, 2018

perf python: More portable way to make CFLAGS work with clang



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 <ehabkost@redhat.com>
Reported-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/20181005204058.7966-3-ehabkost@redhat.com


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent e13a5d69

tools/perf/util/setup.py

+8 −6

Original line number	Diff line number	Diff line
		@@ -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"])
		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"):
		build_time_vars["CFLAGS"] = sub("-mcet", "", build_time_vars["CFLAGS"])
		vars[var] = sub("-mcet", "", vars[var])
		if not clang_has_option("-fcf-protection"):
		build_time_vars["CFLAGS"] = sub("-fcf-protection", "", build_time_vars["CFLAGS"])
		vars[var] = sub("-fcf-protection", "", vars[var])

		from distutils.core import setup, Extension

Admin message