From a8ccbc38ce383db5c4dad7bfc91aef7bb4cc9b59 Mon Sep 17 00:00:00 2001 From: Tony Date: Sun, 15 Nov 2020 05:17:51 -0500 Subject: [PATCH] llvm: Fix kcsan prompt showing since we don't want kcsan (#120) also move Void LibreSSL out of noccache check so it still runs if ccache is set off --- linux-tkg-config/prepare | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/linux-tkg-config/prepare b/linux-tkg-config/prepare index b5fd434..ff79765 100644 --- a/linux-tkg-config/prepare +++ b/linux-tkg-config/prepare @@ -478,18 +478,19 @@ _tkg_srcprep() { || { [ "$_distro" = "Void" ] && xbps-query -s ccache > /dev/null; } ; then sed -i -e 's/CONFIG_GCC_PLUGINS=y/# CONFIG_GCC_PLUGINS is not set/' ./.config fi - # Void uses LibreSSL - if [ "$_distro" = "Void" ]; then - sed -i -e 's/CONFIG_MODULE_SIG_SHA512=y/# CONFIG_MODULE_SIG_SHA512 is not set/' ./.config - sed -i -e 's/# CONFIG_MODULE_SIG_SHA1 is not set/CONFIG_MODULE_SIG_SHA1=y/' ./.config - sed -i -e 's/CONFIG_MODULE_SIG_HASH="sha512"/CONFIG_MODULE_SIG_HASH="sha1"/' ./.config - fi + fi + # Void uses LibreSSL + if [ "$_distro" = "Void" ]; then + sed -i -e 's/CONFIG_MODULE_SIG_SHA512=y/# CONFIG_MODULE_SIG_SHA512 is not set/' ./.config + sed -i -e 's/# CONFIG_MODULE_SIG_SHA1 is not set/CONFIG_MODULE_SIG_SHA1=y/' ./.config + sed -i -e 's/CONFIG_MODULE_SIG_HASH="sha512"/CONFIG_MODULE_SIG_HASH="sha1"/' ./.config fi # Skip dbg package creation on non-Arch if [ "$_distro" != "Arch" ]; then sed -i -e 's/CONFIG_DEBUG_INFO.*/CONFIG_DEBUG_INFO=n/' ./.config fi if [ "$_compiler_name" = "-llvm" ]; then + echo 'CONFIG_KCSAN=n' >> ./.config if [ "$_basever" != "54" ] && [ "$_basever" != "57" ] && [ "$_basever" != "58" ]; then echo 'CONFIG_INIT_STACK_ALL_PATTERN=n' >> ./.config else