diff --git a/device/linux-amazon-thor/APKBUILD b/device/linux-amazon-thor/APKBUILD
index 9cdccd3d7..3922615f1 100755
--- a/device/linux-amazon-thor/APKBUILD
+++ b/device/linux-amazon-thor/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-amazon-thor"
 pkgver=3.4.113
-pkgrel=1
+pkgrel=2
 pkgdesc="Phoenix Kernel for the 7-inch Kindle Fire HDX 3rd generation"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev x
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-asus-duma/APKBUILD b/device/linux-asus-duma/APKBUILD
index b91190f68..b848cebd9 100644
--- a/device/linux-asus-duma/APKBUILD
+++ b/device/linux-asus-duma/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-asus-duma"
 pkgver=3.4.113
-pkgrel=0
+pkgrel=1
 pkgdesc="ASUS MeMO Pad FHD 10 (ME302KL) kernel fork"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev x
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-asus-grouper/APKBUILD b/device/linux-asus-grouper/APKBUILD
index adff04f14..8c131ab2d 100644
--- a/device/linux-asus-grouper/APKBUILD
+++ b/device/linux-asus-grouper/APKBUILD
@@ -21,7 +21,7 @@ case $pkgver in
 	*.*.*)  _kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=8
+pkgrel=9
 arch="armhf"
 pkgdesc="Nexus 7 (2012) kernel from LineageOS"
 url="https://github.com/LineageOS/android_kernel_asus_grouper"
@@ -46,7 +46,7 @@ _carch="arm"
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-asus-t00f/APKBUILD b/device/linux-asus-t00f/APKBUILD
index 7c8e5cceb..ec644f8f1 100644
--- a/device/linux-asus-t00f/APKBUILD
+++ b/device/linux-asus-t00f/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-asus-t00f"
 pkgver=3.10.107
-pkgrel=0
+pkgrel=1
 pkgdesc="Asus Zenfone 5 kernel fork"
 arch="x86"
 _carch="x86"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev x
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-asus-tf101/APKBUILD b/device/linux-asus-tf101/APKBUILD
index bd20ce12b..ecc262086 100644
--- a/device/linux-asus-tf101/APKBUILD
+++ b/device/linux-asus-tf101/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-asus-tf101"
 pkgver=3.1.10
-pkgrel=0
+pkgrel=1
 pkgdesc="Asus Eee Pad Transformer kernel fork"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev x
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-asus-z00t/APKBUILD b/device/linux-asus-z00t/APKBUILD
index 893b31e4d..0e5c485d2 100644
--- a/device/linux-asus-z00t/APKBUILD
+++ b/device/linux-asus-z00t/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-asus-z00t"
 pkgver=3.10.108
-pkgrel=0
+pkgrel=1
 pkgdesc="Zenfone 2 Laser/Selfie (1080p) kernel fork"
 arch="aarch64"
 _carch="arm64"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev d
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-bq-chaozu/APKBUILD b/device/linux-bq-chaozu/APKBUILD
index 58a7a840e..162e6301a 100644
--- a/device/linux-bq-chaozu/APKBUILD
+++ b/device/linux-bq-chaozu/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-bq-chaozu"
 pkgver=3.18.31
-pkgrel=0
+pkgrel=1
 pkgdesc="Aquaris U kernel fork"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev g
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-fairphone-fp1/APKBUILD b/device/linux-fairphone-fp1/APKBUILD
index 1d9507111..2449f002e 100644
--- a/device/linux-fairphone-fp1/APKBUILD
+++ b/device/linux-fairphone-fp1/APKBUILD
@@ -3,7 +3,7 @@
 
 pkgname="linux-fairphone-fp1"
 pkgver=3.4.5
-pkgrel=0
+pkgrel=1
 pkgdesc="Fairphone 1 kernel fork"
 arch="armhf"
 _carch="arm"
@@ -16,7 +16,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev d
 # Compiler: GCC 6 (doesn't boot when compiled with newer versions)
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-fairphone-fp2/APKBUILD b/device/linux-fairphone-fp2/APKBUILD
index b87f359b6..7b0815c74 100644
--- a/device/linux-fairphone-fp2/APKBUILD
+++ b/device/linux-fairphone-fp2/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-fairphone-fp2"
 pkgver=3.4.0
-pkgrel=7
+pkgrel=8
 pkgdesc="Fairphone 2 kernel fork"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev d
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-google-glass/APKBUILD b/device/linux-google-glass/APKBUILD
index 9e0ce5b47..eeec058c1 100644
--- a/device/linux-google-glass/APKBUILD
+++ b/device/linux-google-glass/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-google-glass"
 pkgver=3.4.83
-pkgrel=0
+pkgrel=1
 pkgdesc="Google Glass kernel fork"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev g
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-gp-peak/APKBUILD b/device/linux-gp-peak/APKBUILD
index d822a4f80..e746f1d9e 100644
--- a/device/linux-gp-peak/APKBUILD
+++ b/device/linux-gp-peak/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-gp-peak"
 pkgver=3.0.21
-pkgrel=2
+pkgrel=3
 pkgdesc="Peak kernel fork"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev g
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-htc-a5ul/APKBUILD b/device/linux-htc-a5ul/APKBUILD
index f4bceb88f..9f11a8659 100644
--- a/device/linux-htc-a5ul/APKBUILD
+++ b/device/linux-htc-a5ul/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-htc-a5ul"
 pkgver=3.4.0
-pkgrel=0
+pkgrel=1
 pkgdesc="hTC Desire 816 kernel fork"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev l
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-htc-ace/APKBUILD b/device/linux-htc-ace/APKBUILD
index 3a2ac0959..b0f058001 100644
--- a/device/linux-htc-ace/APKBUILD
+++ b/device/linux-htc-ace/APKBUILD
@@ -20,7 +20,7 @@ case $pkgver in
 	*.*.*)  _kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=8
+pkgrel=9
 arch="armhf"
 pkgdesc="HTC Desire kernel from OpenDesireProject"
 url="https://github.com/OpenDesireProject/android_kernel_htc_msm7x30"
@@ -45,7 +45,7 @@ _carch="arm"
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-htc-bravo/APKBUILD b/device/linux-htc-bravo/APKBUILD
index d6527713e..7799dd5d5 100644
--- a/device/linux-htc-bravo/APKBUILD
+++ b/device/linux-htc-bravo/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-htc-bravo"
 pkgver=3.0.16
-pkgrel=8
+pkgrel=9
 pkgdesc="HTC Desire kernel from spezi77"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev x
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-htc-flounder/APKBUILD b/device/linux-htc-flounder/APKBUILD
index 97bf55c80..04c9bf0d9 100644
--- a/device/linux-htc-flounder/APKBUILD
+++ b/device/linux-htc-flounder/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-htc-flounder"
 pkgver=3.10.103
-pkgrel=0
+pkgrel=1
 pkgdesc="Google Nexus 9 kernel fork"
 arch="aarch64"
 _carch="arm64"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev g
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-htc-m8/APKBUILD b/device/linux-htc-m8/APKBUILD
index c53703817..d0a8f2a6d 100644
--- a/device/linux-htc-m8/APKBUILD
+++ b/device/linux-htc-m8/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-htc-m8"
 pkgver=3.4.113
-pkgrel=0
+pkgrel=1
 pkgdesc="HTC One M8 kernel fork"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev d
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-htc-vivo/APKBUILD b/device/linux-htc-vivo/APKBUILD
index 732e27979..380d25dc2 100644
--- a/device/linux-htc-vivo/APKBUILD
+++ b/device/linux-htc-vivo/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-htc-vivo"
 pkgver=3.0.101
-pkgrel=0
+pkgrel=1
 pkgdesc="Incredible S kernel fork"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev x
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-huawei-angler/APKBUILD b/device/linux-huawei-angler/APKBUILD
index 13b957819..0949e92e6 100644
--- a/device/linux-huawei-angler/APKBUILD
+++ b/device/linux-huawei-angler/APKBUILD
@@ -21,7 +21,7 @@ case $pkgver in
 	*.*.*)  _kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=6
+pkgrel=7
 arch="aarch64"
 pkgdesc="LineageOS kernel for Nexus 6P Angler"
 url="https://github.com/LineageOS/android_kernel_huawei_angler"
@@ -46,7 +46,7 @@ _carch="arm64"
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-huawei-y530/APKBUILD b/device/linux-huawei-y530/APKBUILD
index 666d2d4ef..06da56d6b 100644
--- a/device/linux-huawei-y530/APKBUILD
+++ b/device/linux-huawei-y530/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-huawei-y530"
 pkgver=3.4.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Kernel for Huawei MSM8x1x devices"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev d
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-infocus-flatfish/APKBUILD b/device/linux-infocus-flatfish/APKBUILD
index b040f788c..910262f2a 100644
--- a/device/linux-infocus-flatfish/APKBUILD
+++ b/device/linux-infocus-flatfish/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-infocus-flatfish"
 pkgver=3.3.0
-pkgrel=0
+pkgrel=1
 pkgdesc="InFocus New Tab F1 kernel fork"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev g
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-jolla-sbj/APKBUILD b/device/linux-jolla-sbj/APKBUILD
index a02570440..117e1a5d7 100644
--- a/device/linux-jolla-sbj/APKBUILD
+++ b/device/linux-jolla-sbj/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-jolla-sbj"
 pkgver=3.4.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Jolla phone kernel fork"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev g
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-leeco-s2/APKBUILD b/device/linux-leeco-s2/APKBUILD
index 7ca5e4999..77f5653ce 100644
--- a/device/linux-leeco-s2/APKBUILD
+++ b/device/linux-leeco-s2/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-leeco-s2"
 pkgver=3.10.106
-pkgrel=0
+pkgrel=1
 pkgdesc="LeEco Le 2 kernel fork"
 arch="aarch64"
 _carch="arm64"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev g
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-lenovo-karate/APKBUILD b/device/linux-lenovo-karate/APKBUILD
index 12e2535eb..c797a78a3 100644
--- a/device/linux-lenovo-karate/APKBUILD
+++ b/device/linux-lenovo-karate/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-lenovo-karate"
 pkgver=3.18.31
-pkgrel=0
+pkgrel=1
 pkgdesc="Lenovo K6 Power kernel fork"
 arch="aarch64"
 _carch="arm64"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev g
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-lg-bullhead/APKBUILD b/device/linux-lg-bullhead/APKBUILD
index ece6ffc92..a12fd8544 100644
--- a/device/linux-lg-bullhead/APKBUILD
+++ b/device/linux-lg-bullhead/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-lg-bullhead"
 pkgver=3.10.108
-pkgrel=0
+pkgrel=1
 pkgdesc="Google Nexus 5X kernel fork"
 arch="aarch64"
 _carch="arm64"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev x
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-lg-d285/APKBUILD b/device/linux-lg-d285/APKBUILD
index c79db457a..25e28cf80 100644
--- a/device/linux-lg-d285/APKBUILD
+++ b/device/linux-lg-d285/APKBUILD
@@ -15,7 +15,7 @@ case $pkgver in
 	*.*.*)  _kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=4
+pkgrel=5
 arch="armhf"
 pkgdesc="LineageOS kernel for LG L65"
 url="https://github.com/LineageOS/android_kernel_lge_msm8226"
@@ -42,7 +42,7 @@ _carch="arm"
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-lg-d855/APKBUILD b/device/linux-lg-d855/APKBUILD
index 4241ae9e4..fe7ffea4b 100644
--- a/device/linux-lg-d855/APKBUILD
+++ b/device/linux-lg-d855/APKBUILD
@@ -21,7 +21,7 @@ case $pkgver in
 	*.*.*)  _kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=10
+pkgrel=11
 arch="armhf"
 pkgdesc="LG G3 kernel from LineageOS"
 url="https://github.com/LineageOS/android_kernel_lge_g3"
@@ -46,7 +46,7 @@ _carch="arm"
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-lg-dory/APKBUILD b/device/linux-lg-dory/APKBUILD
index ca0d0fc75..8cc0a790f 100644
--- a/device/linux-lg-dory/APKBUILD
+++ b/device/linux-lg-dory/APKBUILD
@@ -21,7 +21,7 @@ case $pkgver in
 	*.*.*)  _kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=3
+pkgrel=4
 arch="armhf"
 pkgdesc="Kernel for LG G Watch"
 url="https://android.googlesource.com/kernel/msm/+/android-msm-dory-3.10-marshmallow-mr1-wear-release"
@@ -49,7 +49,7 @@ _carch="arm"
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-lg-h815/APKBUILD b/device/linux-lg-h815/APKBUILD
index 3dffdc9fd..0c2da0db6 100644
--- a/device/linux-lg-h815/APKBUILD
+++ b/device/linux-lg-h815/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-lg-h815"
 pkgver=3.10.84
-pkgrel=0
+pkgrel=1
 pkgdesc="LG G4 (h815) kernel fork"
 arch="aarch64"
 _carch="arm64"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev g
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-lg-lenok/APKBUILD b/device/linux-lg-lenok/APKBUILD
index 767077076..27961da60 100644
--- a/device/linux-lg-lenok/APKBUILD
+++ b/device/linux-lg-lenok/APKBUILD
@@ -23,7 +23,7 @@ case $pkgver in
 	*.*.*)  _kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=9
+pkgrel=10
 arch="armhf"
 pkgdesc="G Watch R kernel"
 url="https://github.com/Tsunamical/kernel_lge_bass-lenok"
@@ -48,7 +48,7 @@ _carch="arm"
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-lg-w5/APKBUILD b/device/linux-lg-w5/APKBUILD
index 7d8909de7..0ed5867f2 100644
--- a/device/linux-lg-w5/APKBUILD
+++ b/device/linux-lg-w5/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-lg-w5"
 pkgver=3.4.0
-pkgrel=0
+pkgrel=1
 pkgdesc="L70 kernel fork"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev d
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-motorola-athene/APKBUILD b/device/linux-motorola-athene/APKBUILD
index 2d35a9466..ce96f13b4 100644
--- a/device/linux-motorola-athene/APKBUILD
+++ b/device/linux-motorola-athene/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-motorola-athene"
 pkgver=3.10.108
-pkgrel=0
+pkgrel=1
 pkgdesc="Motorola Moto G4 kernel fork"
 arch="aarch64"
 _carch="arm64"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev d
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-motorola-falcon/APKBUILD b/device/linux-motorola-falcon/APKBUILD
index 0f89d0558..0c982a7f7 100644
--- a/device/linux-motorola-falcon/APKBUILD
+++ b/device/linux-motorola-falcon/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-motorola-falcon"
 pkgver=3.4.113
-pkgrel=2
+pkgrel=3
 pkgdesc="Moto G (2013) kernel fork"
 arch="armhf"
 _carch="arm"
@@ -18,7 +18,7 @@ makedepends="coreutils perl sed installkernel bash gmp-dev bc linux-headers elfu
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-motorola-ghost/APKBUILD b/device/linux-motorola-ghost/APKBUILD
index 7980322ba..a70dd33b5 100644
--- a/device/linux-motorola-ghost/APKBUILD
+++ b/device/linux-motorola-ghost/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-motorola-ghost"
 pkgver=3.4.42
-pkgrel=1
+pkgrel=2
 pkgdesc="Moto X (2013) kernel fork"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev d
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-motorola-harpia/APKBUILD b/device/linux-motorola-harpia/APKBUILD
index 298a1988b..bb077091d 100644
--- a/device/linux-motorola-harpia/APKBUILD
+++ b/device/linux-motorola-harpia/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-motorola-harpia"
 pkgver=3.10.49
-pkgrel=0
+pkgrel=1
 pkgdesc="Motorola Moto G4 Play kernel fork"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev d
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-motorola-maserati/APKBUILD b/device/linux-motorola-maserati/APKBUILD
index 6cd1ee52c..b27e94dc2 100644
--- a/device/linux-motorola-maserati/APKBUILD
+++ b/device/linux-motorola-maserati/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-motorola-maserati"
 pkgver=3.0.8
-pkgrel=0
+pkgrel=1
 pkgdesc="Motorola Droid 4 kernel fork"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev g
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-motorola-osprey/APKBUILD b/device/linux-motorola-osprey/APKBUILD
index a60855f82..732780597 100644
--- a/device/linux-motorola-osprey/APKBUILD
+++ b/device/linux-motorola-osprey/APKBUILD
@@ -9,7 +9,7 @@ case $pkgver in
 	*.*.*)  _kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=4
+pkgrel=5
 arch="armhf"
 pkgdesc="Moto G (2015) kernel from LineageOS"
 url="https://github.com/LineageOS/android_kernel_motorola_msm8916"
@@ -35,7 +35,7 @@ _carch="arm"
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-motorola-peregrine/APKBUILD b/device/linux-motorola-peregrine/APKBUILD
index 50af15dfa..005382daf 100644
--- a/device/linux-motorola-peregrine/APKBUILD
+++ b/device/linux-motorola-peregrine/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-motorola-peregrine"
 pkgver=3.4.113
-pkgrel=1
+pkgrel=2
 pkgdesc="Moto G 4G (2013) kernel fork"
 arch="armhf"
 _carch="arm"
@@ -18,7 +18,7 @@ makedepends="coreutils perl sed installkernel bash gmp-dev bc linux-headers elfu
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-motorola-potter/APKBUILD b/device/linux-motorola-potter/APKBUILD
index 95b02f279..fb89236d6 100644
--- a/device/linux-motorola-potter/APKBUILD
+++ b/device/linux-motorola-potter/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-motorola-potter"
 pkgver=3.18.91
-pkgrel=0
+pkgrel=1
 pkgdesc="Motorola Moto G5 Plus kernel fork"
 arch="aarch64"
 _carch="arm64"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev d
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-motorola-shamu/APKBUILD b/device/linux-motorola-shamu/APKBUILD
index 4717d79a4..bc4386439 100644
--- a/device/linux-motorola-shamu/APKBUILD
+++ b/device/linux-motorola-shamu/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-motorola-shamu"
 pkgver=3.10.40
-pkgrel=1
+pkgrel=2
 pkgdesc="Motorola Google Nexus 6 kernel fork"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev g
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-motorola-surnia/APKBUILD b/device/linux-motorola-surnia/APKBUILD
index c9440acca..11e8a0fd3 100644
--- a/device/linux-motorola-surnia/APKBUILD
+++ b/device/linux-motorola-surnia/APKBUILD
@@ -3,7 +3,7 @@
 
 pkgname="linux-motorola-surnia"
 pkgver=3.10.49
-pkgrel=0
+pkgrel=1
 pkgdesc="Motorola Moto E (2nd Gen) kernel fork"
 arch="armhf"
 _carch="arm"
@@ -16,7 +16,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev d
 # Compiler: GCC 6 (doesn't compile with newer versions)
 if [ "${CC:0:5}" != "gcc6-" ]; then
     CC="gcc6-$CC"
-    HOSTCC="gcc6-gcc"
+    HOSTCC="gcc-6"
     CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-motorola-titan/APKBUILD b/device/linux-motorola-titan/APKBUILD
index 108a07a73..9035bfe3c 100644
--- a/device/linux-motorola-titan/APKBUILD
+++ b/device/linux-motorola-titan/APKBUILD
@@ -25,7 +25,7 @@ case $pkgver in
 	*.*.*)  _kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=8
+pkgrel=9
 arch="armhf"
 pkgdesc="Motorola Moto G 2014 kernel from LineageOS"
 url="https://github.com/LineageOS/android_kernel_motorola_msm8226"
@@ -53,7 +53,7 @@ _carch="arm"
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-nextbit-robin/APKBUILD b/device/linux-nextbit-robin/APKBUILD
index 2f836abe6..dc9db7d7c 100644
--- a/device/linux-nextbit-robin/APKBUILD
+++ b/device/linux-nextbit-robin/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-nextbit-robin"
 pkgver=3.10.108
-pkgrel=0
+pkgrel=1
 pkgdesc="Nextbit Robin kernel fork"
 arch="aarch64"
 _carch="arm64"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev g
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-nokia-rm885/APKBUILD b/device/linux-nokia-rm885/APKBUILD
index 1215a7baa..e7cbb95ce 100644
--- a/device/linux-nokia-rm885/APKBUILD
+++ b/device/linux-nokia-rm885/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-nokia-rm885"
 pkgver=3.4.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Lumia 720 kernel fork"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev d
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-oneplus-bacon/APKBUILD b/device/linux-oneplus-bacon/APKBUILD
index 8209591f5..1c23e24e0 100644
--- a/device/linux-oneplus-bacon/APKBUILD
+++ b/device/linux-oneplus-bacon/APKBUILD
@@ -22,7 +22,7 @@ case $pkgver in
 	*.*.*) _kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=8
+pkgrel=9
 arch="armhf"
 pkgdesc="LineageOS 14.1 kernel for OnePlus One (bacon)"
 url="https://github.com/LineageOS/android_kernel_oneplus_msm8974"
@@ -47,7 +47,7 @@ _carch="arm"
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-oneplus-oneplus2/APKBUILD b/device/linux-oneplus-oneplus2/APKBUILD
index 82aacb32d..c3e8d3f77 100644
--- a/device/linux-oneplus-oneplus2/APKBUILD
+++ b/device/linux-oneplus-oneplus2/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-oneplus-oneplus2"
 pkgver=3.10.108
-pkgrel=1
+pkgrel=2
 pkgdesc="OnePlus 2 kernel fork"
 arch="aarch64"
 _carch="arm64"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev g
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-oneplus-onyx/APKBUILD b/device/linux-oneplus-onyx/APKBUILD
index 452df5476..07d86420c 100644
--- a/device/linux-oneplus-onyx/APKBUILD
+++ b/device/linux-oneplus-onyx/APKBUILD
@@ -32,7 +32,7 @@ case $pkgver in
 	*.*.*) _kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=1
+pkgrel=2
 arch="armhf"
 pkgdesc="LineageOS 14.1 kernel for OnePlus X (onyx)"
 url="https://github.com/LineageOS/android_kernel_oneplus_onyx"
@@ -62,7 +62,7 @@ _carch="arm"
 # See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-samsung-espresso10/APKBUILD b/device/linux-samsung-espresso10/APKBUILD
index 5c49282dd..575ef3ce3 100644
--- a/device/linux-samsung-espresso10/APKBUILD
+++ b/device/linux-samsung-espresso10/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-samsung-espresso10"
 pkgver=3.0.101
-pkgrel=1
+pkgrel=2
 pkgdesc="Samsung Galaxy Tab 2 (10.1 inch) kernel fork"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev g
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-samsung-gts210vewifi/APKBUILD b/device/linux-samsung-gts210vewifi/APKBUILD
index 133580bf8..edcafe5e7 100644
--- a/device/linux-samsung-gts210vewifi/APKBUILD
+++ b/device/linux-samsung-gts210vewifi/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-samsung-gts210vewifi"
 pkgver=3.10.102
-pkgrel=0
+pkgrel=1
 pkgdesc="Galaxy Tab S2 9.7 WiFi (SM-T813) kernel fork"
 arch="aarch64"
 _carch="arm64"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev d
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-samsung-i747m/APKBUILD b/device/linux-samsung-i747m/APKBUILD
index e54e11b30..69b3c7aeb 100644
--- a/device/linux-samsung-i747m/APKBUILD
+++ b/device/linux-samsung-i747m/APKBUILD
@@ -8,7 +8,7 @@
 
 pkgname="linux-samsung-i747m"
 pkgver=3.4.112
-pkgrel=0
+pkgrel=1
 pkgdesc="Samsung Galaxy SIII (USA/Canada) kernel fork"
 arch="armhf"
 _carch="arm"
@@ -23,7 +23,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers xz elfutils-de
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-samsung-i8190/APKBUILD b/device/linux-samsung-i8190/APKBUILD
index 71cf89f2c..6857c8f65 100644
--- a/device/linux-samsung-i8190/APKBUILD
+++ b/device/linux-samsung-i8190/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-samsung-i8190"
 pkgver=3.0.31
-pkgrel=1
+pkgrel=2
 pkgdesc="Samsung Galaxy SIII mini kernel fork"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev g
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-samsung-i8200/APKBUILD b/device/linux-samsung-i8200/APKBUILD
index 5f34c1aaa..5cbbb0eb3 100644
--- a/device/linux-samsung-i8200/APKBUILD
+++ b/device/linux-samsung-i8200/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-samsung-i8200"
 pkgver=3.4.5
-pkgrel=0
+pkgrel=1
 pkgdesc="Samsung SIII mini Value Edition kernel fork"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev d
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-samsung-i9003/APKBUILD b/device/linux-samsung-i9003/APKBUILD
index 571a46c95..fa9310d54 100644
--- a/device/linux-samsung-i9003/APKBUILD
+++ b/device/linux-samsung-i9003/APKBUILD
@@ -24,7 +24,7 @@ case $pkgver in
 	*.*.*)  _kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=11
+pkgrel=12
 arch="armhf"
 pkgdesc="Samsung Galaxy SI SLC kernel"
 url="https://github.com/dhiru1602/android_kernel_samsung_latona"
@@ -54,7 +54,7 @@ _carch="arm"
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-samsung-i9070/APKBUILD b/device/linux-samsung-i9070/APKBUILD
index 628ea26d1..607193a41 100644
--- a/device/linux-samsung-i9070/APKBUILD
+++ b/device/linux-samsung-i9070/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-samsung-i9070"
 pkgver=3.0.101
-pkgrel=10
+pkgrel=11
 pkgdesc="Samsung Galaxy S Advance kernel from Epirex"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev b
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-samsung-i9195/APKBUILD b/device/linux-samsung-i9195/APKBUILD
index eb251df0c..1478f080a 100644
--- a/device/linux-samsung-i9195/APKBUILD
+++ b/device/linux-samsung-i9195/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-samsung-i9195"
 pkgver=3.4.113
-pkgrel=1
+pkgrel=2
 pkgdesc="Samsung Samsung Galaxy S4 Mini kernel fork"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev x
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-samsung-i9305/APKBUILD b/device/linux-samsung-i9305/APKBUILD
index 3d8480ec7..389230038 100644
--- a/device/linux-samsung-i9305/APKBUILD
+++ b/device/linux-samsung-i9305/APKBUILD
@@ -23,7 +23,7 @@ case $pkgver in
 	*.*.*)  _kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=4
+pkgrel=5
 arch="armhf"
 pkgdesc="Samsung Galaxy SIII LTE kernel from LineageOS"
 url="https://github.com/LineageOS/android_kernel_samsung_smdk4412"
@@ -47,7 +47,7 @@ _carch="arm"
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-samsung-jflte/APKBUILD b/device/linux-samsung-jflte/APKBUILD
index 164767c81..483b850ef 100644
--- a/device/linux-samsung-jflte/APKBUILD
+++ b/device/linux-samsung-jflte/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-samsung-jflte"
 pkgver=3.4.112
-pkgrel=4
+pkgrel=5
 pkgdesc="Samsung Galaxy S4 kernel fork"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev g
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-samsung-klte/APKBUILD b/device/linux-samsung-klte/APKBUILD
index 26cf9b7fb..b2c017242 100644
--- a/device/linux-samsung-klte/APKBUILD
+++ b/device/linux-samsung-klte/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-samsung-klte"
 pkgver=3.4.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Samsung Galaxy S5 kernel fork"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev x
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-samsung-kminilte/APKBUILD b/device/linux-samsung-kminilte/APKBUILD
index 98d6f5cd3..0d436cf95 100644
--- a/device/linux-samsung-kminilte/APKBUILD
+++ b/device/linux-samsung-kminilte/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-samsung-kminilte"
 pkgver=3.4.113
-pkgrel=0
+pkgrel=1
 pkgdesc="Samsung Galaxy S5 Mini kernel fork"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev g
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-samsung-kylepro/APKBUILD b/device/linux-samsung-kylepro/APKBUILD
index 38b605570..e62fe7a1c 100644
--- a/device/linux-samsung-kylepro/APKBUILD
+++ b/device/linux-samsung-kylepro/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-samsung-kylepro"
 pkgver=3.4.113
-pkgrel=0
+pkgrel=1
 pkgdesc="Samsung Galaxy Trend Plus kernel fork"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev g
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-samsung-kylessopen/APKBUILD b/device/linux-samsung-kylessopen/APKBUILD
index 43bbdb21a..286fe7bcd 100644
--- a/device/linux-samsung-kylessopen/APKBUILD
+++ b/device/linux-samsung-kylessopen/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-samsung-kylessopen"
 pkgver=3.0.101
-pkgrel=1
+pkgrel=2
 pkgdesc="Galaxy Trend kernel fork"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev l
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-samsung-kylevess/APKBUILD b/device/linux-samsung-kylevess/APKBUILD
index 485ac14b6..9e04b45b1 100644
--- a/device/linux-samsung-kylevess/APKBUILD
+++ b/device/linux-samsung-kylevess/APKBUILD
@@ -1,7 +1,7 @@
 # Kernel config based on: arch/arm/configs/bcm21664_hawaii_ss_kylevess_rev00_defconfig
 pkgname="linux-samsung-kylevess"
 pkgver=3.4.5
-pkgrel=4
+pkgrel=5
 pkgdesc="Samsung Trend Lite kernel fork"
 arch="armhf"
 _carch="arm"
@@ -16,7 +16,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev x
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-samsung-lt023g/APKBUILD b/device/linux-samsung-lt023g/APKBUILD
index cbbe9b7ee..b0a8819cc 100644
--- a/device/linux-samsung-lt023g/APKBUILD
+++ b/device/linux-samsung-lt023g/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-samsung-lt023g"
 pkgver=3.4.5
-pkgrel=0
+pkgrel=1
 pkgdesc="Samsung Galaxy Tab 3 7.0 kernel fork"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev g
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-samsung-maguro/APKBUILD b/device/linux-samsung-maguro/APKBUILD
index 0e1e42816..30ba57e9d 100644
--- a/device/linux-samsung-maguro/APKBUILD
+++ b/device/linux-samsung-maguro/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-samsung-maguro"
 pkgver=3.0.31
-pkgrel=10
+pkgrel=11
 pkgdesc="Samsung Galaxy Nexus kernel from LineageOS"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev g
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-samsung-manta/APKBUILD b/device/linux-samsung-manta/APKBUILD
index 1cd68a97a..235be6700 100644
--- a/device/linux-samsung-manta/APKBUILD
+++ b/device/linux-samsung-manta/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-samsung-manta"
 pkgver=3.4.113
-pkgrel=0
+pkgrel=1
 pkgdesc="Google Nexus 10 kernel fork"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev g
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-samsung-n5110/APKBUILD b/device/linux-samsung-n5110/APKBUILD
index d32333b8b..7525c36ae 100644
--- a/device/linux-samsung-n5110/APKBUILD
+++ b/device/linux-samsung-n5110/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-samsung-n5110"
 pkgver=3.0.101
-pkgrel=2
+pkgrel=3
 pkgdesc="Samsung Galaxy Note 8.0 (Wi-Fi) kernel fork"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev x
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-samsung-n7100/APKBUILD b/device/linux-samsung-n7100/APKBUILD
index 11423a653..b24825349 100644
--- a/device/linux-samsung-n7100/APKBUILD
+++ b/device/linux-samsung-n7100/APKBUILD
@@ -26,7 +26,7 @@ case $pkgver in
 	*.*.*)  _kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=6
+pkgrel=7
 arch="armhf"
 pkgdesc="Samsung Galaxy Note II (GSM) Kernel from ParanoidNote"
 url="https://github.com/bigbiff/android_kernel_samsung_smdk4412"
@@ -53,7 +53,7 @@ _carch="arm"
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-samsung-s6500d/APKBUILD b/device/linux-samsung-s6500d/APKBUILD
index b2ea68d2f..6acf4b399 100644
--- a/device/linux-samsung-s6500d/APKBUILD
+++ b/device/linux-samsung-s6500d/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-samsung-s6500d"
 pkgver=3.4.105
-pkgrel=0
+pkgrel=1
 pkgdesc="Samsung Galaxy Mini 2 kernel fork"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev g
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-samsung-serranodsdd/APKBUILD b/device/linux-samsung-serranodsdd/APKBUILD
index 8982330d0..6055735ef 100644
--- a/device/linux-samsung-serranodsdd/APKBUILD
+++ b/device/linux-samsung-serranodsdd/APKBUILD
@@ -3,7 +3,7 @@
 
 pkgname="linux-samsung-serranodsdd"
 pkgver=3.4.113
-pkgrel=0
+pkgrel=1
 pkgdesc="Samsung Galaxy S4 Mini (dual sim) kernel fork"
 arch="armhf"
 _carch="arm"
@@ -16,7 +16,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev d
 # Compiler: GCC 6 (doesn't boot when compiled with newer versions)
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-semc-anzu/APKBUILD b/device/linux-semc-anzu/APKBUILD
index c95b0fa1e..9727a4f0c 100644
--- a/device/linux-semc-anzu/APKBUILD
+++ b/device/linux-semc-anzu/APKBUILD
@@ -8,7 +8,7 @@
 
 pkgname="linux-semc-anzu"
 pkgver=3.4.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Xperia Arc/Arc S kernel fork"
 arch="armhf"
 _carch="arm"
@@ -23,7 +23,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev x
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-semc-smultron/APKBUILD b/device/linux-semc-smultron/APKBUILD
index d96f48833..a995a6719 100644
--- a/device/linux-semc-smultron/APKBUILD
+++ b/device/linux-semc-smultron/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-semc-smultron"
 pkgver=3.4.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Xperia mini kernel fork"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev d
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-sony-castor-windy/APKBUILD b/device/linux-sony-castor-windy/APKBUILD
index ddcf901ce..cbf899497 100644
--- a/device/linux-sony-castor-windy/APKBUILD
+++ b/device/linux-sony-castor-windy/APKBUILD
@@ -21,7 +21,7 @@ case $pkgver in
 	*.*.*)  _kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=4
+pkgrel=5
 arch="armhf"
 pkgdesc="Sony Xperia Z2 Tablet kernel"
 url="https://github.com/andersson"
@@ -46,7 +46,7 @@ _carch="arm"
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-sony-coconut/APKBUILD b/device/linux-sony-coconut/APKBUILD
index 5c5d65d57..ed932cf5f 100644
--- a/device/linux-sony-coconut/APKBUILD
+++ b/device/linux-sony-coconut/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-sony-coconut"
 pkgver=3.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Live with Walkman kernel fork"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="xz perl sed installkernel bash gmp-dev bc linux-headers elfutils-de
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-sony-honami/APKBUILD b/device/linux-sony-honami/APKBUILD
index f2c27ef94..7d3bccc65 100644
--- a/device/linux-sony-honami/APKBUILD
+++ b/device/linux-sony-honami/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-sony-honami"
 pkgver=3.10.84
-pkgrel=0
+pkgrel=1
 pkgdesc="Sony Xperia Z1 kernel fork"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev g
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-sony-scorpion/APKBUILD b/device/linux-sony-scorpion/APKBUILD
index 03af109c6..817dd0cdd 100644
--- a/device/linux-sony-scorpion/APKBUILD
+++ b/device/linux-sony-scorpion/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-sony-scorpion"
 pkgver=3.10.84
-pkgrel=0
+pkgrel=1
 pkgdesc="Xperia Z3 Tablet Compact kernel fork"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev g
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-sony-seagull/APKBUILD b/device/linux-sony-seagull/APKBUILD
index b7b36163c..bae1833a9 100644
--- a/device/linux-sony-seagull/APKBUILD
+++ b/device/linux-sony-seagull/APKBUILD
@@ -4,7 +4,7 @@
 
 pkgname="linux-sony-seagull"
 pkgver=3.4.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Sony Xperia T3 kernel fork"
 arch="armhf"
 _carch="arm"
@@ -19,7 +19,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev d
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-sony-tulip/APKBUILD b/device/linux-sony-tulip/APKBUILD
index edf9f2249..b7c5c2002 100644
--- a/device/linux-sony-tulip/APKBUILD
+++ b/device/linux-sony-tulip/APKBUILD
@@ -3,7 +3,7 @@
 
 pkgname="linux-sony-tulip"
 pkgver=3.10
-pkgrel=0
+pkgrel=1
 pkgdesc="Sony Xperia M4 Aqua kernel fork"
 arch="aarch64"
 _carch="arm64"
@@ -16,7 +16,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev d
 # Compiler: GCC 6 (doesn't boot when compiled with newer versions)
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-sony-yuga/APKBUILD b/device/linux-sony-yuga/APKBUILD
index 38b55a7c2..00d24bbba 100644
--- a/device/linux-sony-yuga/APKBUILD
+++ b/device/linux-sony-yuga/APKBUILD
@@ -21,7 +21,7 @@ case $pkgver in
 	*.*.*)  _kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=5
+pkgrel=6
 arch="armhf"
 pkgdesc="Sony Xperia Z kernel"
 url="https://github.com/LineageOS/android_kernel_sony_apq8064"
@@ -49,7 +49,7 @@ _carch="arm"
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-t2m-flame/APKBUILD b/device/linux-t2m-flame/APKBUILD
index 4d76a910d..f63f86d46 100644
--- a/device/linux-t2m-flame/APKBUILD
+++ b/device/linux-t2m-flame/APKBUILD
@@ -21,7 +21,7 @@ case $pkgver in
 	*.*.*)  _kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=9
+pkgrel=10
 arch="armhf"
 pkgdesc="T2M flame kernel"
 url="https://github.com/mozilla-b2g/codeaurora_kernel_msm"
@@ -51,7 +51,7 @@ _carch="arm"
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-wiko-lenny3/APKBUILD b/device/linux-wiko-lenny3/APKBUILD
index f2c918094..80e199438 100644
--- a/device/linux-wiko-lenny3/APKBUILD
+++ b/device/linux-wiko-lenny3/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-wiko-lenny3"
 pkgver=3.18.19
-pkgrel=0
+pkgrel=1
 pkgdesc="Wiko Lenny 3 Kernel"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev g
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-wingtech-wt88047/APKBUILD b/device/linux-wingtech-wt88047/APKBUILD
index 1ac525d54..85d0d03d9 100644
--- a/device/linux-wingtech-wt88047/APKBUILD
+++ b/device/linux-wingtech-wt88047/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-wingtech-wt88047"
 pkgver=3.10.108
-pkgrel=0
+pkgrel=1
 pkgdesc="Xiaomi Redmi 2 kernel fork"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev d
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-xiaomi-armani/APKBUILD b/device/linux-xiaomi-armani/APKBUILD
index d7be2a495..d06f6a07f 100644
--- a/device/linux-xiaomi-armani/APKBUILD
+++ b/device/linux-xiaomi-armani/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-xiaomi-armani"
 pkgver=3.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Redmi 1S kernel fork"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev d
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-xiaomi-cancro/APKBUILD b/device/linux-xiaomi-cancro/APKBUILD
index c30dbbde9..9f57f17e2 100644
--- a/device/linux-xiaomi-cancro/APKBUILD
+++ b/device/linux-xiaomi-cancro/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-xiaomi-cancro"
 pkgver=3.4.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Mi 3 kernel fork"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="xz perl sed installkernel bash gmp-dev bc linux-headers elfutils-de
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-xiaomi-ido/APKBUILD b/device/linux-xiaomi-ido/APKBUILD
index ff49c030c..811cd6bc1 100644
--- a/device/linux-xiaomi-ido/APKBUILD
+++ b/device/linux-xiaomi-ido/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-xiaomi-ido"
 pkgver=3.10.107
-pkgrel=2
+pkgrel=3
 pkgdesc="Xiaomi Xiaomi RedMi 3 kernel fork"
 arch="aarch64"
 _carch="arm64"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev d
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-xiaomi-mido/APKBUILD b/device/linux-xiaomi-mido/APKBUILD
index 31cb5f885..070c20be6 100644
--- a/device/linux-xiaomi-mido/APKBUILD
+++ b/device/linux-xiaomi-mido/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-xiaomi-mido"
 pkgver=3.18.31
-pkgrel=0
+pkgrel=1
 pkgdesc="Xiaomi Redmi Note 4 kernel fork"
 arch="aarch64"
 _carch="arm64"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev g
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-xiaomi-santoni/APKBUILD b/device/linux-xiaomi-santoni/APKBUILD
index f6a34e166..be01d0077 100644
--- a/device/linux-xiaomi-santoni/APKBUILD
+++ b/device/linux-xiaomi-santoni/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-xiaomi-santoni"
 pkgver=3.18.31
-pkgrel=0
+pkgrel=1
 pkgdesc="Xiaomi Redmi 4X kernel fork"
 arch="aarch64"
 _carch="arm64"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev g
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
diff --git a/device/linux-zte-kis3/APKBUILD b/device/linux-zte-kis3/APKBUILD
index 1f5e16c9c..69260f60c 100644
--- a/device/linux-zte-kis3/APKBUILD
+++ b/device/linux-zte-kis3/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-zte-kis3"
 pkgver=3.4.0
-pkgrel=0
+pkgrel=1
 pkgdesc="ZTE Kis 3 kernel fork"
 arch="armhf"
 _carch="arm"
@@ -17,7 +17,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev d
 # well. See <https://postmarketos.org/vendorkernel> for instructions.
 if [ "${CC:0:5}" != "gcc6-" ]; then
 	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
+	HOSTCC="gcc-6"
 	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi