[patch] patch for gcc-config-1.3.6-r3

gcc-config_gcc-lib.patch (text/plain), 938 bytes, created by Peter Beutner on 2004-11-26 08:26:44 UTC

--- gcc-config.orig	2004-11-26 15:57:06.840185544 +0100
+++ gcc-config	2004-11-26 16:02:15.527257976 +0100
@@ -459,7 +459,20 @@ fi
 
 CC_COMP_NO_SPECS=$(echo ${CC_COMP} | awk -F- '{ print $1"-"$2"-"$3"-"$4"-"$5 }')
 
-if [ ! -d "/usr/lib/gcc-lib/${CC_COMP_NO_SPECS%-*}/${CC_COMP_NO_SPECS##*-}" -o \
+# get gcc major/minor version
+GCC_MAJOR=$(echo ${CC_COMP_NO_SPECS} | awk -F- '{ print $5 }' | awk -F. '{ print $1 }')
+GCC_MINOR=$(echo ${CC_COMP_NO_SPECS} | awk -F- '{ print $5 }' | awk -F. '{ print $2 }')
+
+# since gcc 3.4 gcc libraries are installed in /usr/lib/gcc 
+# instead of /usr/lib/gcc-lib
+if [ $GCC_MAJOR -eq 3 ] && [ $GCC_MINOR -ge 4 ];
+then
+	GCC_LIB_DIR="gcc"
+else
+	GCC_LIB_DIR="gcc-lib"
+fi
+
+if [ ! -d "/usr/lib/${GCC_LIB_DIR}/${CC_COMP_NO_SPECS%-*}/${CC_COMP_NO_SPECS##*-}" -o \
      ! -f "/etc/env.d/gcc/${CC_COMP}" ]
 then
 	eerror "$0: Profile does not exist or invalid setting for /etc/env.d/gcc/${CC_COMP}"