From 850650fd38a697b66d9c75733d20be2f0d52829e Mon Sep 17 00:00:00 2001 From: Rahul Shahare Date: Tue, 28 Jan 2020 10:39:05 +0530 Subject: [PATCH] scripts: build-all.py: set clang as REAL_CC for arm To support LLVM for arm, set REAL_CC to clang which overrides gcc. All the defconfigs we care about should be in arch/arm/configs/vendor/ so remove the pattern-based detection logic for arm. Change-Id: Id48890e0d7b3ee5a37fe1a6ea2ae762bdd65eeec Signed-off-by: Rahul Shahare --- scripts/build-all.py | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/scripts/build-all.py b/scripts/build-all.py index 33721acbcf4e..ee1c34e81788 100755 --- a/scripts/build-all.py +++ b/scripts/build-all.py @@ -268,18 +268,11 @@ class Builder(): # Build targets can be dependent upon the completion of # previous build targets, so build them one at a time. - if os.environ.get('ARCH') == "arm64": - cmd_line = ['make', - 'INSTALL_HDR_PATH=%s' % hdri_dir, - 'INSTALL_MOD_PATH=%s' % modi_dir, - 'O=%s' % dest_dir, - 'REAL_CC=%s' % clang_bin] - else: - cmd_line = ['make', - 'INSTALL_HDR_PATH=%s' % hdri_dir, - 'INSTALL_MOD_PATH=%s' % modi_dir, - 'O=%s' % dest_dir] - + cmd_line = ['make', + 'INSTALL_HDR_PATH=%s' % hdri_dir, + 'INSTALL_MOD_PATH=%s' % modi_dir, + 'O=%s' % dest_dir, + 'REAL_CC=%s' % clang_bin] build_targets = [] for c in make_command: if re.match(r'^-{1,2}\w', c): @@ -294,18 +287,6 @@ class Builder(): def scan_configs(): """Get the full list of defconfigs appropriate for this tree.""" names = [] - arch_pats = ( - r'[fm]sm[0-9]*_defconfig', - r'apq*_defconfig', - r'qsd*_defconfig', - r'mpq*_defconfig', - r'sdm*_defconfig', - r'sdx*_defconfig', - ) - for p in arch_pats: - for n in glob.glob('arch/arm/configs/' + p): - name = os.path.basename(n)[:-10] - names.append(Builder(name, n)) for defconfig in glob.glob('arch/arm*/configs/vendor/*_defconfig'): target = os.path.basename(defconfig)[:-10] name = target + "-llvm"