r3696 - jhalfs/trunk/common/libs

pierre at higgs.linuxfromscratch.org pierre at higgs.linuxfromscratch.org
Fri Apr 5 08:12:13 PDT 2013


Author: pierre
Date: Fri Apr  5 08:12:13 2013
New Revision: 3696

Log:
Adapt func_check_version.sh so that both GCC and Gcc are
recognized in the minimal version table

Modified:
   jhalfs/trunk/common/libs/func_check_version.sh

Modified: jhalfs/trunk/common/libs/func_check_version.sh
==============================================================================
--- jhalfs/trunk/common/libs/func_check_version.sh	Fri Apr  5 06:26:25 2013	(r3695)
+++ jhalfs/trunk/common/libs/func_check_version.sh	Fri Apr  5 08:12:13 2013	(r3696)
@@ -97,8 +97,12 @@
   # 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"



More information about the alfs-log mailing list