_get_gcc_version_from_config(): give current gcc version if no srcdir is set

4 files changed, 52 insertions, 20 deletions

diff --git a/extra/linux-galileo-gen2/PKGBUILD b/extra/linux-galileo-gen2/PKGBUILD
index 0cb05e97..c7885561 100644
--- a/extra/linux-galileo-gen2/PKGBUILD
+++ b/extra/linux-galileo-gen2/PKGBUILD
@@ -94,11 +94,19 @@ _package() {
 }
 
 _get_gcc_version_from_config() {
-  sed '
-    s/^CONFIG_CC_VERSION_TEXT="gcc (GCC) \([0-9.]\+\)"$/\1/
-    t
-    d
-  ' "$srcdir/$_srcname/.config"
+  if [ -z "$srcdir" ]; then
+    gcc --version \
+    | sed '
+      s@^.* @@
+      1!d
+    '
+  else
+    sed '
+      s/^CONFIG_CC_VERSION_TEXT="gcc (GCC) \([0-9.]\+\)"$/\1/
+      t
+      d
+    ' "$srcdir/$_srcname/.config"
+  fi
 }
 
 _package-headers() {
diff --git a/extra/linux-olpc-xo1/PKGBUILD b/extra/linux-olpc-xo1/PKGBUILD
index e3ecde3d..a3a0ff77 100644
--- a/extra/linux-olpc-xo1/PKGBUILD
+++ b/extra/linux-olpc-xo1/PKGBUILD
@@ -168,11 +168,19 @@ _package-headers() {
 }
 
 _get_gcc_version_from_config() {
-  sed '
-    s/^CONFIG_CC_VERSION_TEXT="gcc (GCC) \([0-9.]\+\)"$/\1/
-    t
-    d
-  ' "$srcdir/$_srcname/.config"
+  if [ -z "$srcdir" ]; then
+    gcc --version \
+    | sed '
+      s@^.* @@
+      1!d
+    '
+  else
+    sed '
+      s/^CONFIG_CC_VERSION_TEXT="gcc (GCC) \([0-9.]\+\)"$/\1/
+      t
+      d
+    ' "$srcdir/$_srcname/.config"
+  fi
 }
 
 _package-docs() {
diff --git a/extra/linux-pae/PKGBUILD b/extra/linux-pae/PKGBUILD
index 6451244a..89582c86 100644
--- a/extra/linux-pae/PKGBUILD
+++ b/extra/linux-pae/PKGBUILD
@@ -198,11 +198,19 @@ _package-headers() {
 }
 
 _get_gcc_version_from_config() {
-  sed '
-    s/^CONFIG_CC_VERSION_TEXT="gcc (GCC) \([0-9.]\+\)"$/\1/
-    t
-    d
-  ' "$srcdir/$_srcname/.config"
+  if [ -z "$srcdir" ]; then
+    gcc --version \
+    | sed '
+      s@^.* @@
+      1!d
+    '
+  else
+    sed '
+      s/^CONFIG_CC_VERSION_TEXT="gcc (GCC) \([0-9.]\+\)"$/\1/
+      t
+      d
+    ' "$srcdir/$_srcname/.config"
+  fi
 }
 
 _package-docs() {
diff --git a/extra/linux-zen/PKGBUILD b/extra/linux-zen/PKGBUILD
index 41ef2d72..f6f34664 100644
--- a/extra/linux-zen/PKGBUILD
+++ b/extra/linux-zen/PKGBUILD
@@ -20,11 +20,19 @@ eval "$(
 )"
 
 _get_gcc_version_from_config() {
-  sed '
-    s/^CONFIG_CC_VERSION_TEXT="gcc (GCC) \([0-9.]\+\)"$/\1/
-    t
-    d
-  ' "$srcdir/$_srcname/.config"
+  if [ -z "$srcdir" ]; then
+    gcc --version \
+    | sed '
+      s@^.* @@
+      1!d
+    '
+  else
+    sed '
+      s/^CONFIG_CC_VERSION_TEXT="gcc (GCC) \([0-9.]\+\)"$/\1/
+      t
+      d
+    ' "$srcdir/$_srcname/.config"
+  fi
 }
 
 # use our tarballer instead of cloning from git