From e46ed00256fc6d06fac0689dcf5e9073d2ae3a03 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Thu, 22 Sep 2022 12:22:44 +0200 Subject: _get_gcc_version_from_config find more config locations --- core/linux-lts/PKGBUILD | 2 +- core/linux/PKGBUILD | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'core') diff --git a/core/linux-lts/PKGBUILD b/core/linux-lts/PKGBUILD index 45fd907e..1493a189 100644 --- a/core/linux-lts/PKGBUILD +++ b/core/linux-lts/PKGBUILD @@ -24,7 +24,7 @@ _get_gcc_version_from_config() { 1!d ' else - for _config_file in "$srcdir/$_srcname/.config" "$srcdir/config"; do + for _config_file in "$srcdir/$_srcname/.config" "$srcdir/config" "${srcdir%/*}/config"; do [ -f "$file" ] && break done sed ' diff --git a/core/linux/PKGBUILD b/core/linux/PKGBUILD index 565e16ba..c668ea6e 100644 --- a/core/linux/PKGBUILD +++ b/core/linux/PKGBUILD @@ -41,11 +41,14 @@ _get_gcc_version_from_config() { 1!d ' else + for _config_file in "$srcdir/$_srcname/.config" "$srcdir/config" "${srcdir%/*}/config"; do + [ -f "$file" ] && break + done sed ' s/^CONFIG_CC_VERSION_TEXT="gcc (GCC) \([0-9.]\+\)"$/\1/ t d - ' "$srcdir/$_srcname/.config" + ' "$_config_file" fi } -- cgit v1.2.3-54-g00ecf