From 447b2e6fd2e924e814764ddbb4bd630a7a2e85ae Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Fri, 28 Feb 2020 10:22:58 +0100
Subject: [PATCH] device/linux-*: remove HOSTCC for kernels using latest GCC
 (!1007)

---
 device/linux-asus-flo/APKBUILD                   |  6 +-----
 device/linux-asus-grouper/APKBUILD               |  6 +-----
 device/linux-asus-z00vd/APKBUILD                 | 10 +++-------
 device/linux-chuwi-hi10plus/APKBUILD             |  4 ----
 device/linux-finepower-f1/APKBUILD               |  4 ----
 device/linux-google-crosshatch-mainline/APKBUILD |  7 ++-----
 device/linux-google-crosshatch/APKBUILD          |  4 ----
 device/linux-htc-evita/APKBUILD                  |  4 ----
 device/linux-htc-m7/APKBUILD                     |  4 ----
 device/linux-htc-memul/APKBUILD                  |  4 ----
 device/linux-htc-primou/APKBUILD                 |  4 ----
 device/linux-htc-ville/APKBUILD                  |  4 ----
 device/linux-huawei-cameron/APKBUILD             |  4 +---
 device/linux-huawei-lua-u22/APKBUILD             |  4 ----
 device/linux-lg-d722/APKBUILD                    |  4 ----
 device/linux-lg-mako/APKBUILD                    |  4 ----
 device/linux-lg-vee7e/APKBUILD                   |  4 ----
 device/linux-meizu-turbo/APKBUILD                |  4 ----
 device/linux-motorola-cedric/APKBUILD            |  4 ----
 device/linux-motorola-lux/APKBUILD               |  4 ----
 device/linux-motorola-montana/APKBUILD           |  4 ----
 device/linux-nokia-frt/APKBUILD                  |  4 ----
 device/linux-nokia-n9/APKBUILD                   |  6 +-----
 device/linux-oppo-find-7a/APKBUILD               |  4 ----
 device/linux-ouya-ouya-mainline/APKBUILD         |  6 +-----
 device/linux-purism-librem5/APKBUILD             |  4 ----
 device/linux-samsung-a5y17lte/APKBUILD           |  4 ----
 device/linux-samsung-apexq/APKBUILD              |  4 ----
 device/linux-samsung-ariesve/APKBUILD            |  4 ----
 device/linux-samsung-hero2lte/APKBUILD           |  4 ----
 device/linux-samsung-herolte/APKBUILD            |  4 ----
 device/linux-samsung-i9003/APKBUILD              |  4 ----
 device/linux-samsung-i9100/APKBUILD              |  4 ----
 device/linux-samsung-i927/APKBUILD               |  6 +-----
 device/linux-samsung-j1mini3g/APKBUILD           |  4 ----
 device/linux-samsung-j3nxlte/APKBUILD            |  4 ----
 device/linux-samsung-jflte/APKBUILD              |  4 ----
 device/linux-samsung-kylepro/APKBUILD            |  4 ----
 device/linux-samsung-kylessopen/APKBUILD         |  4 ----
 device/linux-samsung-lt01wifi/APKBUILD           |  4 ----
 device/linux-samsung-matissewifi/APKBUILD        |  4 ----
 device/linux-samsung-p4wifi/APKBUILD             |  6 +-----
 device/linux-samsung-royss/APKBUILD              |  4 ----
 device/linux-samsung-s6500d/APKBUILD             |  4 ----
 device/linux-samsung-zanin/APKBUILD              |  4 ----
 device/linux-sony-amami/APKBUILD                 |  4 ----
 device/linux-sony-aries/APKBUILD                 |  4 ----
 device/linux-sony-honami/APKBUILD                |  4 ----
 device/linux-sony-nicki-mainline/APKBUILD        |  5 +----
 device/linux-sony-nicki/APKBUILD                 |  4 ----
 device/linux-sony-taoshan/APKBUILD               |  4 ----
 device/linux-sony-yuga/APKBUILD                  |  4 ----
 device/linux-teclast-x80pro/APKBUILD             |  8 ++------
 device/linux-xiaomi-aries/APKBUILD               |  4 ----
 device/linux-xiaomi-santoni/APKBUILD             |  4 ----
 device/linux-zte-kis3/APKBUILD                   |  4 ----
 device/linux-zte-p731a20/APKBUILD                |  4 ----
 57 files changed, 15 insertions(+), 239 deletions(-)

diff --git a/device/linux-asus-flo/APKBUILD b/device/linux-asus-flo/APKBUILD
index 645a6ecd5..f06ea3a42 100644
--- a/device/linux-asus-flo/APKBUILD
+++ b/device/linux-asus-flo/APKBUILD
@@ -32,10 +32,6 @@ license="GPL2"
 _abi_release=${pkgver}
 _carch="arm"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 ksrcdir="$srcdir/linux-$pkgver"
 
 prepare() {
@@ -62,7 +58,7 @@ prepare() {
 
 	mkdir -p "$srcdir"/build
 	cp "$srcdir"/$_config "$srcdir"/build/.config
-	make -C "$ksrcdir" O="$srcdir"/build ARCH="$_carch" HOSTCC="$HOSTCC" \
+	make -C "$ksrcdir" O="$srcdir"/build ARCH="$_carch" \
 	silentoldconfig
 }
 
diff --git a/device/linux-asus-grouper/APKBUILD b/device/linux-asus-grouper/APKBUILD
index 9f6ddf51b..66f1d559e 100644
--- a/device/linux-asus-grouper/APKBUILD
+++ b/device/linux-asus-grouper/APKBUILD
@@ -20,16 +20,12 @@ license="GPL-2.0-only"
 
 _carch="arm"
 
-# Compiler: latest GCC from Alpine
-_hostcc="${CC:-gcc}"
-_hostcc="${_hostcc#${CROSS_COMPILE}}"
-
 _ksrcdir="$srcdir/linux-$_commit"
 
 prepare() {
 	mkdir -p "$srcdir"/build
 	cp -v "$srcdir"/$_config "$srcdir"/build/.config
-	make -C "$_ksrcdir" O="$srcdir"/build ARCH="$_carch" HOSTCC="$_hostcc" \
+	make -C "$_ksrcdir" O="$srcdir"/build ARCH="$_carch" \
 		olddefconfig
 }
 
diff --git a/device/linux-asus-z00vd/APKBUILD b/device/linux-asus-z00vd/APKBUILD
index e634eb6a5..f4bc0485b 100644
--- a/device/linux-asus-z00vd/APKBUILD
+++ b/device/linux-asus-z00vd/APKBUILD
@@ -12,10 +12,6 @@ license="GPL2"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev python3"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="ZC500TG"
 _commit="7957ae0b17bb46d56a5cddd1d313aec76296aee8"
@@ -46,12 +42,12 @@ prepare() {
 	mkdir "$builddir/out"
 
 	# Clean up kernel source
-	make -C "$builddir" O="$builddir/out" ARCH="$_carch" ARCH_MTK_PLATFORM="mt6580" HOSTCC="$HOSTCC" clean
-	make -C "$builddir" O="$builddir/out" ARCH="$_carch" ARCH_MTK_PLATFORM="mt6580" HOSTCC="$HOSTCC" mrproper
+	make -C "$builddir" O="$builddir/out" ARCH="$_carch" ARCH_MTK_PLATFORM="mt6580" clean
+	make -C "$builddir" O="$builddir/out" ARCH="$_carch" ARCH_MTK_PLATFORM="mt6580" mrproper
 
 	# Prepare kernel config ('yes ""' for kernels lacking olddefconfig)
 	cp "$srcdir"/$_config "$builddir"/out/.config
-	yes "" | make O="$builddir/out" ARCH="$_carch" ARCH_MTK_PLATFORM="mt6580" HOSTCC="$HOSTCC" oldconfig
+	yes "" | make O="$builddir/out" ARCH="$_carch" ARCH_MTK_PLATFORM="mt6580" oldconfig
 }
 
 build() {
diff --git a/device/linux-chuwi-hi10plus/APKBUILD b/device/linux-chuwi-hi10plus/APKBUILD
index 98c89ebd9..1ed0a33f2 100644
--- a/device/linux-chuwi-hi10plus/APKBUILD
+++ b/device/linux-chuwi-hi10plus/APKBUILD
@@ -15,10 +15,6 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev
 	     devicepkg-dev bison flex openssl-dev xz coreutils findutils"
 subpackages="$pkgname-dev"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _config="config-${_flavor}.${arch}"
 source="
diff --git a/device/linux-finepower-f1/APKBUILD b/device/linux-finepower-f1/APKBUILD
index bf320821e..9af85df0b 100644
--- a/device/linux-finepower-f1/APKBUILD
+++ b/device/linux-finepower-f1/APKBUILD
@@ -13,10 +13,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev dtbtool"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _commit="b30390f1645dcf1ebd08148d7d4086a544c56435"
 _repository="kernel_7730"
diff --git a/device/linux-google-crosshatch-mainline/APKBUILD b/device/linux-google-crosshatch-mainline/APKBUILD
index 635b52f9e..57fd52fe2 100644
--- a/device/linux-google-crosshatch-mainline/APKBUILD
+++ b/device/linux-google-crosshatch-mainline/APKBUILD
@@ -43,9 +43,6 @@ ppc*) _carch="powerpc" ;;
 s390*) _carch="s390" ;;
 esac
 
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 builddir="$srcdir/linux-$_commit"
 
 prepare() {
@@ -73,7 +70,7 @@ prepare() {
 
 	mkdir -p "$srcdir"/build
 	cp -v "$srcdir"/$_config "$srcdir"/build/.config
-	make -C "$builddir" O="$srcdir"/build ARCH="$_carch" HOSTCC="$HOSTCC" \
+	make -C "$builddir" O="$srcdir"/build ARCH="$_carch" \
 		olddefconfig
 }
 
@@ -130,7 +127,7 @@ dev() {
 	# external modules, and create the scripts
 	mkdir -p "$dir"
 	cp "$srcdir"/$_config "$dir"/.config
-	make -j1 -C "$builddir" O="$dir" ARCH="$_carch" HOSTCC="$HOSTCC" \
+	make -j1 -C "$builddir" O="$dir" ARCH="$_carch" \
 		olddefconfig prepare modules_prepare scripts
 
 	# needed for 3rd party modules
diff --git a/device/linux-google-crosshatch/APKBUILD b/device/linux-google-crosshatch/APKBUILD
index 0d8a9e472..e542defe8 100644
--- a/device/linux-google-crosshatch/APKBUILD
+++ b/device/linux-google-crosshatch/APKBUILD
@@ -13,10 +13,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev dtbtool openssl-dev lz4 dtc"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="android_kernel_google_crosshatch"
 # Lineage 16.0 branch
diff --git a/device/linux-htc-evita/APKBUILD b/device/linux-htc-evita/APKBUILD
index f95e7a7a7..7bb9c75c7 100644
--- a/device/linux-htc-evita/APKBUILD
+++ b/device/linux-htc-evita/APKBUILD
@@ -13,10 +13,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="android_kernel_htc_msm8960"
 _commit="9b9100465d6c6a2d0248009863f2d4bf05598124"
diff --git a/device/linux-htc-m7/APKBUILD b/device/linux-htc-m7/APKBUILD
index ad58443fa..83d655b15 100644
--- a/device/linux-htc-m7/APKBUILD
+++ b/device/linux-htc-m7/APKBUILD
@@ -13,10 +13,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="android_kernel_htc_m7"
 _commit="f6eb6496406f5a06cdd4716e494082d78df70e83"
diff --git a/device/linux-htc-memul/APKBUILD b/device/linux-htc-memul/APKBUILD
index 34c4468b7..4c22a1a4b 100644
--- a/device/linux-htc-memul/APKBUILD
+++ b/device/linux-htc-memul/APKBUILD
@@ -13,10 +13,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev dtbtool xz"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="android_kernel_htc_msm8974-caf_rebase"
 _commit="909c034f8c080b4acbf64921e57a9e4e96322db0"
diff --git a/device/linux-htc-primou/APKBUILD b/device/linux-htc-primou/APKBUILD
index 22a0187e8..e7a73164b 100644
--- a/device/linux-htc-primou/APKBUILD
+++ b/device/linux-htc-primou/APKBUILD
@@ -13,10 +13,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="xz perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev"
 
-# Compiler
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="android_kernel_htc_primou_new"
 _commit="f674566057bd4e5552e06d920e768fb6b50a0058"
diff --git a/device/linux-htc-ville/APKBUILD b/device/linux-htc-ville/APKBUILD
index def4de3db..c1ba09b22 100644
--- a/device/linux-htc-ville/APKBUILD
+++ b/device/linux-htc-ville/APKBUILD
@@ -13,10 +13,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="android_kernel_htc_msm8960"
 _commit="5b59c1be35a99c8913d33e68d608eee9cdef3393"
diff --git a/device/linux-huawei-cameron/APKBUILD b/device/linux-huawei-cameron/APKBUILD
index b4932e0a8..bee56656a 100644
--- a/device/linux-huawei-cameron/APKBUILD
+++ b/device/linux-huawei-cameron/APKBUILD
@@ -11,8 +11,6 @@ url="https://kernel.org"
 license="GPL2"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev python dtc"
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
 
 # Source
 _repository="android_kernel_huawei_hi3660"
@@ -39,7 +37,7 @@ build() {
 	mkdir "$outdir"
 	cp "$srcdir/$_config" "$outdir/.config"
 	rm "$builddir/.config"
-	make ARCH="$_carch" HOSTCC="$HOSTCC" O="$outdir" oldconfig
+	make ARCH="$_carch" O="$outdir" oldconfig
 	make ARCH="$_carch" CC="${CC:-gcc}" \
 		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS" O="$outdir"
 }
diff --git a/device/linux-huawei-lua-u22/APKBUILD b/device/linux-huawei-lua-u22/APKBUILD
index f38315a02..a2ed6e6db 100644
--- a/device/linux-huawei-lua-u22/APKBUILD
+++ b/device/linux-huawei-lua-u22/APKBUILD
@@ -13,10 +13,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="xz perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="kernel-huawei-y3ii"
 _commit="83637cb899ac81dfdabd8935181caec15a7c6929"
diff --git a/device/linux-lg-d722/APKBUILD b/device/linux-lg-d722/APKBUILD
index d275a06b6..fd2b405db 100644
--- a/device/linux-lg-d722/APKBUILD
+++ b/device/linux-lg-d722/APKBUILD
@@ -13,10 +13,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev dtbtool"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="android_kernel_lge_msm8226"
 _commit="bf756279493c2cc4656b784afa29822b30838e98"
diff --git a/device/linux-lg-mako/APKBUILD b/device/linux-lg-mako/APKBUILD
index 467bfc709..1aa7ec524 100644
--- a/device/linux-lg-mako/APKBUILD
+++ b/device/linux-lg-mako/APKBUILD
@@ -13,10 +13,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="lge-kernel-mako"
 _commit="1495bfcf93f9e0e896331f29e1850387c31d6714"
diff --git a/device/linux-lg-vee7e/APKBUILD b/device/linux-lg-vee7e/APKBUILD
index 6428a6a97..1e371a5ca 100644
--- a/device/linux-lg-vee7e/APKBUILD
+++ b/device/linux-lg-vee7e/APKBUILD
@@ -13,10 +13,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="lge-kernel-lproj"
 _commit="8a90ec65502bde12a03c60d6756eea3e88c02917"
diff --git a/device/linux-meizu-turbo/APKBUILD b/device/linux-meizu-turbo/APKBUILD
index eab9b13a3..48391486e 100644
--- a/device/linux-meizu-turbo/APKBUILD
+++ b/device/linux-meizu-turbo/APKBUILD
@@ -13,10 +13,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="m576"
 _commit="2d3fa1ca1fbc8b52c75b2bcc3784b7e52085768b"
diff --git a/device/linux-motorola-cedric/APKBUILD b/device/linux-motorola-cedric/APKBUILD
index 4270cd4b0..46191b86c 100644
--- a/device/linux-motorola-cedric/APKBUILD
+++ b/device/linux-motorola-cedric/APKBUILD
@@ -13,10 +13,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev dtbtool xz"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="android_kernel_motorola_msm8937"
 _commit="2d29701ed2d080029f0bd3ceba07df66ae4e9c2d"
diff --git a/device/linux-motorola-lux/APKBUILD b/device/linux-motorola-lux/APKBUILD
index 09088f99b..5378f7f16 100644
--- a/device/linux-motorola-lux/APKBUILD
+++ b/device/linux-motorola-lux/APKBUILD
@@ -13,10 +13,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev xz dtbtool"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="android_kernel_motorola_msm8916"
 _commit="d86037d30519f2e1f26af75bdcf11a74d08dfed4"
diff --git a/device/linux-motorola-montana/APKBUILD b/device/linux-motorola-montana/APKBUILD
index 282d78d0b..4b2111758 100644
--- a/device/linux-motorola-montana/APKBUILD
+++ b/device/linux-motorola-montana/APKBUILD
@@ -13,10 +13,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev dtbtool xz"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="android_kernel_motorola_msm8937"
 _commit="1e8993177823e4ddf3b5d91da6335d75ad513dec"
diff --git a/device/linux-nokia-frt/APKBUILD b/device/linux-nokia-frt/APKBUILD
index 4d469dd5a..6c2341d5e 100644
--- a/device/linux-nokia-frt/APKBUILD
+++ b/device/linux-nokia-frt/APKBUILD
@@ -14,10 +14,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev python"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="android_kernel_nokia_1"
 _commit="588ea962d4c9c21d20a7109273587e49c7da9235"
diff --git a/device/linux-nokia-n9/APKBUILD b/device/linux-nokia-n9/APKBUILD
index ed1ec5a05..4352c6f7a 100644
--- a/device/linux-nokia-n9/APKBUILD
+++ b/device/linux-nokia-n9/APKBUILD
@@ -42,10 +42,6 @@ license="GPL2"
 _abi_release=${pkgver}
 _carch="arm"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 ksrcdir="$srcdir/linux-$_basever"
 
 prepare() {
@@ -78,7 +74,7 @@ prepare() {
 
 	mkdir -p "$srcdir"/build
 	cp "$srcdir"/$_config "$srcdir"/build/.config || return 1
-	make -C "$ksrcdir" O="$srcdir"/build ARCH="$_carch" HOSTCC="$HOSTCC" \
+	make -C "$ksrcdir" O="$srcdir"/build ARCH="$_carch" \
 		olddefconfig
 }
 
diff --git a/device/linux-oppo-find-7a/APKBUILD b/device/linux-oppo-find-7a/APKBUILD
index 0e402145f..9a8330bc2 100644
--- a/device/linux-oppo-find-7a/APKBUILD
+++ b/device/linux-oppo-find-7a/APKBUILD
@@ -14,10 +14,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc elfutils-libelf devicepkg-dev dtbtool xz"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="android_kernel_oppo_msm8974"
 _commit="60e8a8df2d253b053cdac10a0ffd196b7b9c3925"
diff --git a/device/linux-ouya-ouya-mainline/APKBUILD b/device/linux-ouya-ouya-mainline/APKBUILD
index 58fa0ba63..9e2470da7 100644
--- a/device/linux-ouya-ouya-mainline/APKBUILD
+++ b/device/linux-ouya-ouya-mainline/APKBUILD
@@ -12,10 +12,6 @@ license="GPL2"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev xz flex bison openssl-dev"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="linux"
 _rev="7c3acfbc49c690a8ec27f2269840a7e141182ab9"
@@ -31,7 +27,7 @@ prepare() {
 
 	mkdir -p "$srcdir"/build
 	cp -v "$srcdir"/$_config "$srcdir"/build/.config
-	make -C "$builddir" O="$srcdir"/build ARCH="$_carch" HOSTCC="$HOSTCC" \
+	make -C "$builddir" O="$srcdir"/build ARCH="$_carch" \
 		olddefconfig
 }
 
diff --git a/device/linux-purism-librem5/APKBUILD b/device/linux-purism-librem5/APKBUILD
index 7ecd19f2e..69cf7b9fb 100644
--- a/device/linux-purism-librem5/APKBUILD
+++ b/device/linux-purism-librem5/APKBUILD
@@ -13,10 +13,6 @@ options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev
 	     devicepkg-dev bison flex openssl-dev"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="linux-next"
 # imx8-current-librem5 branch:
diff --git a/device/linux-samsung-a5y17lte/APKBUILD b/device/linux-samsung-a5y17lte/APKBUILD
index 4b4872e22..da2134cbd 100644
--- a/device/linux-samsung-a5y17lte/APKBUILD
+++ b/device/linux-samsung-a5y17lte/APKBUILD
@@ -13,10 +13,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev dtbtool-exynos"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="android_kernel_samsung_universal7880"
 _commit="9af43285ff43d74f3f40f910023e57dfad1c8e63"
diff --git a/device/linux-samsung-apexq/APKBUILD b/device/linux-samsung-apexq/APKBUILD
index ac3cef95e..e9e939378 100644
--- a/device/linux-samsung-apexq/APKBUILD
+++ b/device/linux-samsung-apexq/APKBUILD
@@ -13,10 +13,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="xz perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="android_kernel_samsung_d2"
 _commit="3795379ed3f846bf17908ff29576a93caff5d1d7"
diff --git a/device/linux-samsung-ariesve/APKBUILD b/device/linux-samsung-ariesve/APKBUILD
index 76b1571c7..0fe7a0a3d 100644
--- a/device/linux-samsung-ariesve/APKBUILD
+++ b/device/linux-samsung-ariesve/APKBUILD
@@ -13,10 +13,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev xz"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="samsung-kernel-msm7x30"
 _commit="b157ddfd3a28f6e6b2dca4acfc8fcbd0ad684489"
diff --git a/device/linux-samsung-hero2lte/APKBUILD b/device/linux-samsung-hero2lte/APKBUILD
index 8d6a366d0..b54fa34bf 100644
--- a/device/linux-samsung-hero2lte/APKBUILD
+++ b/device/linux-samsung-hero2lte/APKBUILD
@@ -13,10 +13,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev dtbtool"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source - use Ivan Meler's 3.18 upstream kernel
 _repository="android_kernel_samsung_herolte"
 _commit="24b577569468748591f7be6435af67e17b532886"
diff --git a/device/linux-samsung-herolte/APKBUILD b/device/linux-samsung-herolte/APKBUILD
index ae70ffdf3..fc62b1d32 100644
--- a/device/linux-samsung-herolte/APKBUILD
+++ b/device/linux-samsung-herolte/APKBUILD
@@ -13,10 +13,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev dtbtool-exynos"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source - use Ivan Meler's 3.18 upstream kernel
 _repository="android_kernel_samsung_herolte"
 _commit="4f50ed696fc6ec36d277ba1af73e98d34e7bc0d6"
diff --git a/device/linux-samsung-i9003/APKBUILD b/device/linux-samsung-i9003/APKBUILD
index 945d98e8b..d15ca3219 100644
--- a/device/linux-samsung-i9003/APKBUILD
+++ b/device/linux-samsung-i9003/APKBUILD
@@ -13,10 +13,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev busybox-static-armhf"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="android_kernel_samsung_latona"
 _commit="7b8d73dd32e6cd21107f9a963a32a5ed237a6e78"
diff --git a/device/linux-samsung-i9100/APKBUILD b/device/linux-samsung-i9100/APKBUILD
index 713137c8b..ccce630e4 100644
--- a/device/linux-samsung-i9100/APKBUILD
+++ b/device/linux-samsung-i9100/APKBUILD
@@ -14,10 +14,6 @@ options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev
 	findutils busybox-static-armhf"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="android_kernel_samsung_smdk4412"
 _commit="349a3e91e76d17e67ef6213e1f6712e700695631"
diff --git a/device/linux-samsung-i927/APKBUILD b/device/linux-samsung-i927/APKBUILD
index 7a0f23bbe..96e7ab29e 100644
--- a/device/linux-samsung-i927/APKBUILD
+++ b/device/linux-samsung-i927/APKBUILD
@@ -13,10 +13,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev flex bison openssl-dev"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="linux"
 _config="config-${_flavor}.${arch}"
@@ -90,7 +86,7 @@ prepare() {
 
 	# Prepare kernel config ('yes ""' for kernels lacking olddefconfig)
 	cp "$srcdir/$_config" "$builddir"/.config
-	yes "" | make -C "$builddir" ARCH="$_carch" HOSTCC="$HOSTCC" oldconfig
+	yes "" | make -C "$builddir" ARCH="$_carch" oldconfig
 }
 
 build() {
diff --git a/device/linux-samsung-j1mini3g/APKBUILD b/device/linux-samsung-j1mini3g/APKBUILD
index be224fb58..d6d4393bd 100644
--- a/device/linux-samsung-j1mini3g/APKBUILD
+++ b/device/linux-samsung-j1mini3g/APKBUILD
@@ -13,10 +13,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev dtbtool"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="android_kernel_samsung_j1mini3g"
 _commit="6a377f7c43a84b578df39300dcce9fb9cb387a21"
diff --git a/device/linux-samsung-j3nxlte/APKBUILD b/device/linux-samsung-j3nxlte/APKBUILD
index e0dccee3c..3978a785b 100644
--- a/device/linux-samsung-j3nxlte/APKBUILD
+++ b/device/linux-samsung-j3nxlte/APKBUILD
@@ -13,10 +13,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="mkbootimg perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev dtbtool"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="android_kernel_samsung_sharkls"
 _commit="e3381e42b00e1ff977815b365cea53f18afff7a8"
diff --git a/device/linux-samsung-jflte/APKBUILD b/device/linux-samsung-jflte/APKBUILD
index 0f3bce098..aa1b4b026 100644
--- a/device/linux-samsung-jflte/APKBUILD
+++ b/device/linux-samsung-jflte/APKBUILD
@@ -13,10 +13,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="android_kernel_samsung_jf"
 _commit="e8d93e03563e42d7c762d4e9a87d77115102b301"
diff --git a/device/linux-samsung-kylepro/APKBUILD b/device/linux-samsung-kylepro/APKBUILD
index 8994970ca..b8b81628d 100644
--- a/device/linux-samsung-kylepro/APKBUILD
+++ b/device/linux-samsung-kylepro/APKBUILD
@@ -13,10 +13,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="android_kernel_samsung_kyleproxx"
 _commit="026cf3b3e97ec40aa1c0c52837a318725786f05a"
diff --git a/device/linux-samsung-kylessopen/APKBUILD b/device/linux-samsung-kylessopen/APKBUILD
index d67e227f9..027684257 100644
--- a/device/linux-samsung-kylessopen/APKBUILD
+++ b/device/linux-samsung-kylessopen/APKBUILD
@@ -13,10 +13,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev lzo xz"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source: backup of https://github.com/pavlepiramida/FrankenKernel
 _kernel="pavlepiramida-frankenkernel"
 _commit="d0e853abec2d7be79f5d9b319273a0b66046b125"
diff --git a/device/linux-samsung-lt01wifi/APKBUILD b/device/linux-samsung-lt01wifi/APKBUILD
index adefd2818..352effcb0 100644
--- a/device/linux-samsung-lt01wifi/APKBUILD
+++ b/device/linux-samsung-lt01wifi/APKBUILD
@@ -13,10 +13,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev xz"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="android_kernel_samsung_smdk4x12"
 _commit="6ad0b18a63deacaebbc3d12751c3230cedbf7335"
diff --git a/device/linux-samsung-matissewifi/APKBUILD b/device/linux-samsung-matissewifi/APKBUILD
index f8cd03af5..cd9226a4d 100644
--- a/device/linux-samsung-matissewifi/APKBUILD
+++ b/device/linux-samsung-matissewifi/APKBUILD
@@ -13,10 +13,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev dtbtool devicepkg-dev"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="android_kernel_samsung_matissewifi"
 _commit="0761bc76449b73747698b76a155883342192106f"
diff --git a/device/linux-samsung-p4wifi/APKBUILD b/device/linux-samsung-p4wifi/APKBUILD
index 8b77f580d..ab68feac9 100644
--- a/device/linux-samsung-p4wifi/APKBUILD
+++ b/device/linux-samsung-p4wifi/APKBUILD
@@ -12,10 +12,6 @@ license="GPL2"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev xz flex bison openssl-dev"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="linux"
 _rev="8de8fd48d3a4765b7cef982e550cc06b806d5977"
@@ -31,7 +27,7 @@ prepare() {
 
 	mkdir -p "$srcdir"/build
 	cp -v "$srcdir"/$_config "$srcdir"/build/.config
-	make -C "$builddir" O="$srcdir"/build ARCH="$_carch" HOSTCC="$HOSTCC" \
+	make -C "$builddir" O="$srcdir"/build ARCH="$_carch" \
 		olddefconfig
 }
 
diff --git a/device/linux-samsung-royss/APKBUILD b/device/linux-samsung-royss/APKBUILD
index 4796e54e5..45c67ff87 100644
--- a/device/linux-samsung-royss/APKBUILD
+++ b/device/linux-samsung-royss/APKBUILD
@@ -13,10 +13,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev xz"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="android_kernel_samsung_royss"
 _commit="3169160cd6b23e0325fb5117cc347fc6acb2bc48"
diff --git a/device/linux-samsung-s6500d/APKBUILD b/device/linux-samsung-s6500d/APKBUILD
index 33f344965..2a1a490e1 100644
--- a/device/linux-samsung-s6500d/APKBUILD
+++ b/device/linux-samsung-s6500d/APKBUILD
@@ -12,10 +12,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="android_kernel_samsung_msm7x27a"
 _commit="d70eebdb55d7011c82ce64fe5eae2fdcbfd4e425"
diff --git a/device/linux-samsung-zanin/APKBUILD b/device/linux-samsung-zanin/APKBUILD
index 4e55b5a20..e742947e9 100644
--- a/device/linux-samsung-zanin/APKBUILD
+++ b/device/linux-samsung-zanin/APKBUILD
@@ -14,10 +14,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="android_kernel_rhea"
 _commit="8224116dca7de79d181c0761468f569e6ac3505e"
diff --git a/device/linux-sony-amami/APKBUILD b/device/linux-sony-amami/APKBUILD
index a69dddba9..013e5c9ee 100644
--- a/device/linux-sony-amami/APKBUILD
+++ b/device/linux-sony-amami/APKBUILD
@@ -13,10 +13,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="kernel"
 _commit="2134cafba220b32c43701368413ee333b41b7fe0"
diff --git a/device/linux-sony-aries/APKBUILD b/device/linux-sony-aries/APKBUILD
index b2ebbea63..3246b25fb 100644
--- a/device/linux-sony-aries/APKBUILD
+++ b/device/linux-sony-aries/APKBUILD
@@ -13,10 +13,6 @@ license="GPL2"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="kernel"
 _commit="2134cafba220b32c43701368413ee333b41b7fe0"
diff --git a/device/linux-sony-honami/APKBUILD b/device/linux-sony-honami/APKBUILD
index cc0abc4a0..e93543bdc 100644
--- a/device/linux-sony-honami/APKBUILD
+++ b/device/linux-sony-honami/APKBUILD
@@ -13,10 +13,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="kernel"
 _commit="d78970c1afd9fad52cb4402c7bcb9701e8a06d41"
diff --git a/device/linux-sony-nicki-mainline/APKBUILD b/device/linux-sony-nicki-mainline/APKBUILD
index 51d4d2fea..cb0dd7cf2 100644
--- a/device/linux-sony-nicki-mainline/APKBUILD
+++ b/device/linux-sony-nicki-mainline/APKBUILD
@@ -41,9 +41,6 @@ ppc*) _carch="powerpc" ;;
 s390*) _carch="s390" ;;
 esac
 
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 builddir="$srcdir/linux-$_commit"
 
 prepare() {
@@ -71,7 +68,7 @@ prepare() {
 
 	mkdir -p "$srcdir"/build
 	cp -v "$srcdir"/$_config "$srcdir"/build/.config
-	make -C "$builddir" O="$srcdir"/build ARCH="$_carch" HOSTCC="$HOSTCC" \
+	make -C "$builddir" O="$srcdir"/build ARCH="$_carch" \
 		olddefconfig
 }
 
diff --git a/device/linux-sony-nicki/APKBUILD b/device/linux-sony-nicki/APKBUILD
index fb00c426d..ee243df9d 100644
--- a/device/linux-sony-nicki/APKBUILD
+++ b/device/linux-sony-nicki/APKBUILD
@@ -13,10 +13,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="android_kernel_sony_msm8x27"
 _commit="627687e4625d208248fe5fa40dcaaeb3363dfce7"
diff --git a/device/linux-sony-taoshan/APKBUILD b/device/linux-sony-taoshan/APKBUILD
index 7c94edcfc..32864d5ef 100644
--- a/device/linux-sony-taoshan/APKBUILD
+++ b/device/linux-sony-taoshan/APKBUILD
@@ -13,10 +13,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="android_kernel_sony_msm8930"
 _commit="df6292bc628cece5925d0f67fbc8c8a2cab2d524"
diff --git a/device/linux-sony-yuga/APKBUILD b/device/linux-sony-yuga/APKBUILD
index d72015748..f571ecd64 100644
--- a/device/linux-sony-yuga/APKBUILD
+++ b/device/linux-sony-yuga/APKBUILD
@@ -16,10 +16,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="android_kernel_sony_apq8064"
 _commit="f164c6d1016cb34ac90c053acbebe6e47fdd400f"
diff --git a/device/linux-teclast-x80pro/APKBUILD b/device/linux-teclast-x80pro/APKBUILD
index d8a1ce833..680f62b65 100644
--- a/device/linux-teclast-x80pro/APKBUILD
+++ b/device/linux-teclast-x80pro/APKBUILD
@@ -42,10 +42,6 @@ ppc*) _carch="powerpc" ;;
 s390*) _carch="s390" ;;
 esac
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 ksrcdir="$srcdir/linux-$_kernver"
 
 prepare() {
@@ -86,7 +82,7 @@ prepare() {
 
 	mkdir -p "$srcdir"/build
 	cp -v "$srcdir"/$_config "$srcdir"/build/.config
-	make -C "$ksrcdir" O="$srcdir"/build ARCH="$_carch" HOSTCC="$HOSTCC" \
+	make -C "$ksrcdir" O="$srcdir"/build ARCH="$_carch" \
 		olddefconfig
 }
 
@@ -143,7 +139,7 @@ dev() {
 	# external modules, and create the scripts
 	mkdir -p "$dir"
 	cp "$srcdir"/$_config "$dir"/.config
-	make -j1 -C "$srcdir"/linux-$_kernver O="$dir" ARCH="$_carch" HOSTCC="$HOSTCC" \
+	make -j1 -C "$srcdir"/linux-$_kernver O="$dir" ARCH="$_carch" \
 		olddefconfig prepare modules_prepare scripts
 
 	# needed for 3rd party modules
diff --git a/device/linux-xiaomi-aries/APKBUILD b/device/linux-xiaomi-aries/APKBUILD
index 3324e99d0..291e241ea 100644
--- a/device/linux-xiaomi-aries/APKBUILD
+++ b/device/linux-xiaomi-aries/APKBUILD
@@ -13,10 +13,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev xz"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _username="MoKee"
 _repository="android_kernel_xiaomi_aries"
diff --git a/device/linux-xiaomi-santoni/APKBUILD b/device/linux-xiaomi-santoni/APKBUILD
index eec7893b4..ef57eb1e9 100644
--- a/device/linux-xiaomi-santoni/APKBUILD
+++ b/device/linux-xiaomi-santoni/APKBUILD
@@ -11,10 +11,6 @@ license="GPL2"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="msm-3.18"
 _commit="2dd8017f40290eb326e352cca254cd8bdd1614c9"
diff --git a/device/linux-zte-kis3/APKBUILD b/device/linux-zte-kis3/APKBUILD
index 0efb4634e..38d73833e 100644
--- a/device/linux-zte-kis3/APKBUILD
+++ b/device/linux-zte-kis3/APKBUILD
@@ -15,10 +15,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev dtbtool xz"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="android_kernel_zte_msm8610"
 _commit="b55a46067bb75d8a290b2cc0e07f5fb3d8207cb1"
diff --git a/device/linux-zte-p731a20/APKBUILD b/device/linux-zte-p731a20/APKBUILD
index d8555907f..19e27bfeb 100644
--- a/device/linux-zte-p731a20/APKBUILD
+++ b/device/linux-zte-p731a20/APKBUILD
@@ -13,10 +13,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev dtbtool"
 
-# Compiler: latest GCC from Alpine
-HOSTCC="${CC:-gcc}"
-HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
-
 # Source
 _repository="android_kernel_zte_P731A20"
 _commit="0004a6b85c34e31dacbb49525e608ad75e167082"