CCF_100/linux-tkg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

llvm: Fix kcsan prompt showing since we don't want kcsan (#120)

Browse Source 
also move Void LibreSSL out of noccache check so it still runs if ccache
is set off
This commit is contained in:
Tony 2020-11-15 05:17:51 -05:00 committed by GitHub
parent 676c1f1ea8
commit a8ccbc38ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
linux-tkg-config/prepare
View File

@ -478,18 +478,19 @@ _tkg_srcprep() {
|| { [ "$_distro" = "Void" ] && xbps-query -s ccache > /dev/null; } ; then || { [ "$_distro" = "Void" ] && xbps-query -s ccache > /dev/null; } ; then
sed -i -e 's/CONFIG_GCC_PLUGINS=y/# CONFIG_GCC_PLUGINS is not set/' ./.config sed -i -e 's/CONFIG_GCC_PLUGINS=y/# CONFIG_GCC_PLUGINS is not set/' ./.config
fi fi
# Void uses LibreSSL fi
if [ "$_distro" = "Void" ]; then # Void uses LibreSSL
sed -i -e 's/CONFIG_MODULE_SIG_SHA512=y/# CONFIG_MODULE_SIG_SHA512 is not set/' ./.config if [ "$_distro" = "Void" ]; then
sed -i -e 's/# CONFIG_MODULE_SIG_SHA1 is not set/CONFIG_MODULE_SIG_SHA1=y/' ./.config sed -i -e 's/CONFIG_MODULE_SIG_SHA512=y/# CONFIG_MODULE_SIG_SHA512 is not set/' ./.config
sed -i -e 's/CONFIG_MODULE_SIG_HASH="sha512"/CONFIG_MODULE_SIG_HASH="sha1"/' ./.config sed -i -e 's/# CONFIG_MODULE_SIG_SHA1 is not set/CONFIG_MODULE_SIG_SHA1=y/' ./.config
fi sed -i -e 's/CONFIG_MODULE_SIG_HASH="sha512"/CONFIG_MODULE_SIG_HASH="sha1"/' ./.config
fi fi
# Skip dbg package creation on non-Arch # Skip dbg package creation on non-Arch
if [ "$_distro" != "Arch" ]; then if [ "$_distro" != "Arch" ]; then
sed -i -e 's/CONFIG_DEBUG_INFO.*/CONFIG_DEBUG_INFO=n/' ./.config sed -i -e 's/CONFIG_DEBUG_INFO.*/CONFIG_DEBUG_INFO=n/' ./.config
fi fi
if [ "$_compiler_name" = "-llvm" ]; then if [ "$_compiler_name" = "-llvm" ]; then
echo 'CONFIG_KCSAN=n' >> ./.config
if [ "$_basever" != "54" ] && [ "$_basever" != "57" ] && [ "$_basever" != "58" ]; then if [ "$_basever" != "54" ] && [ "$_basever" != "57" ] && [ "$_basever" != "58" ]; then
echo 'CONFIG_INIT_STACK_ALL_PATTERN=n' >> ./.config echo 'CONFIG_INIT_STACK_ALL_PATTERN=n' >> ./.config
else else