_get_gcc_version_from_config find more config locations

6 files changed, 9 insertions, 6 deletions

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
 }
 
diff --git a/extra/linux-galileo-gen2/PKGBUILD b/extra/linux-galileo-gen2/PKGBUILD
index 4504352b..81b8595f 100644
--- a/extra/linux-galileo-gen2/PKGBUILD
+++ b/extra/linux-galileo-gen2/PKGBUILD
@@ -101,7 +101,7 @@ _get_gcc_version_from_config() {
       1!d
     '
   else
-    for _config_file in "$srcdir/$_srcname/.config" "$srcdir/config.${MODEL}"; do
+    for _config_file in "$srcdir/$_srcname/.config" "$srcdir/config.${MODEL}" "${srcdir%/*}/config.${MODEL}"; do
       [ -f "$file" ] && break
     done
     sed '
diff --git a/extra/linux-olpc-xo1/PKGBUILD b/extra/linux-olpc-xo1/PKGBUILD
index eeefca52..d9837bc3 100644
--- a/extra/linux-olpc-xo1/PKGBUILD
+++ b/extra/linux-olpc-xo1/PKGBUILD
@@ -175,7 +175,7 @@ _get_gcc_version_from_config() {
       1!d
     '
   else
-    for _config_file in "$srcdir/$_srcname/.config" "$srcdir/config.${MODEL}"; do
+    for _config_file in "$srcdir/$_srcname/.config" "$srcdir/config.${MODEL}" "${srcdir%/*}/config.${MODEL}"; do
       [ -f "$file" ] && break
     done
     sed '
diff --git a/extra/linux-pae/PKGBUILD b/extra/linux-pae/PKGBUILD
index 051a9437..d01e29df 100644
--- a/extra/linux-pae/PKGBUILD
+++ b/extra/linux-pae/PKGBUILD
@@ -205,7 +205,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/extra/linux-zen/PKGBUILD b/extra/linux-zen/PKGBUILD
index 083e1e5f..e155d5c6 100644
--- a/extra/linux-zen/PKGBUILD
+++ b/extra/linux-zen/PKGBUILD
@@ -27,7 +27,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 '