GCC6 kernels no longer compile

How to reproduce

pmbootstrap build --force linux-samsung-jflte

Relevant errors

WARNING: package gcc6: aport version 6.4.0-r5 is lower than 6.4.0-r7 from the binary repository. 6.4.0-r7 will be used when installing gcc6. See also: https://postmarketos.org/warning-repo2

Still persists after running pmbootstap zap -m

/bin/sh: gcc6-gcc: not found

Probably related to

https://git.alpinelinux.org/cgit/aports/commit/?id=f76673fb030820b2053cad7e5b81ece31079d4cc

We have our own gcc6: https://gitlab.postmarketos.org/postmarketos/pmaports/tree/master/main/gcc6