diff options
author | Guillaume Tucker <guillaume.tucker@collabora.com> | 2019-08-08 17:24:41 +0200 |
---|---|---|
committer | Guillaume Tucker <guillaume.tucker@collabora.com> | 2019-08-09 10:32:57 +0200 |
commit | 975b4490fe8e88618b070b9aa4f6b9f94b856eb9 (patch) | |
tree | f527c2201486f6900769fe95def890ab5e20652d /kernelci | |
parent | b7e4d001db90ebfeebef25d2554e815e5963454f (diff) |
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 <guillaume.tucker@collabora.com>
Diffstat (limited to 'kernelci')
-rw-r--r-- | kernelci/build.py | 6 |
1 files changed, 5 insertions, 1 deletions
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()) |