From 975b4490fe8e88618b070b9aa4f6b9f94b856eb9 Mon Sep 17 00:00:00 2001 From: Guillaume Tucker Date: Thu, 8 Aug 2019 17:24:41 +0200 Subject: kernelci.build: export compiler names when running merge_config.sh Export CC, HOSTCC and CROSS_COMPILE when running merge_config.sh as otherwise it will default to gcc even when building with clang. Signed-off-by: Guillaume Tucker --- kernelci/build.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'kernelci') diff --git a/kernelci/build.py b/kernelci/build.py index 9e7dcf7..1ea186c 100644 --- a/kernelci/build.py +++ b/kernelci/build.py @@ -478,8 +478,12 @@ def _make_defconfig(defconfig, kwargs, fragments): cmd = """\ cd {kdir} export ARCH={arch} +export HOSTCC={cc} +export CC={cc} +export CROSS_COMPILE={cross} scripts/kconfig/merge_config.sh -O {output} '{base}' '{frag}' > /dev/null 2>&1 -""".format(kdir=kdir, arch=kwargs['arch'], output=rel_path, +""".format(kdir=kdir, arch=kwargs['arch'], cc=kwargs['cc'], + cross=kwargs['cross_compile'], output=rel_path, base=os.path.join(rel_path, '.config'), frag=os.path.join(rel_path, kconfig_frag_name)) print(cmd.strip()) -- cgit v1.2.3