From 5e486cf6b7c6e81a89470d44044aa5a2fd7fb5f4 Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre@linuxfromscratch.org>
Date: Fri, 5 Apr 2013 15:14:20 +0000
Subject: [PATCH] Merge trunk r3696

---
 common/libs/func_check_version.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/common/libs/func_check_version.sh b/common/libs/func_check_version.sh
index 024a1d1..7d452d4 100644
--- a/common/libs/func_check_version.sh
+++ b/common/libs/func_check_version.sh
@@ -97,8 +97,12 @@ check_prerequisites() {      #
   # LFS/HLFS/CLFS prerequisites
   check_version "$MIN_Kernel_VER"    "`uname -r`"          "KERNEL"
   check_version "$MIN_Bash_VER"      "$BASH_VERSION"       "BASH"
-  check_version "$MIN_GCC_VER"       "`gcc -dumpversion`"  "GCC"
-  check_version "$MIN_GCC_VER"       "`g++ -dumpversion`"  "G++"
+  if [ ! -z $MIN_GCC_VER ]; then
+    check_version "$MIN_GCC_VER"     "`gcc -dumpversion`"  "GCC"
+    check_version "$MIN_GCC_VER"     "`g++ -dumpversion`"  "G++"
+  elif [ ! -z $MIN_Gcc_VER ]; then
+    check_version "$MIN_Gcc_VER"     "`gcc -dumpversion`"  "GCC"
+  fi
   check_version "$MIN_Glibc_VER"     "$(ldd --version  | head -n1 | awk '{print $NF}')"   "GLIBC"
   check_version "$MIN_Binutils_VER"  "$(ld --version  | head -n1 | awk '{print $NF}')"    "BINUTILS"
   check_version "$MIN_Tar_VER"       "$(tar --version | head -n1 | cut -d" " -f4)"        "TAR"