X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=config.if;h=2655bc3b56ab3744a04f85c723d21da6beec26af;hb=89fdb407c817d49a286bab7027ca91291106a89e;hp=aa35a3f8140ce28cc15328337e2247b4e6746d35;hpb=531034c673e9a705301ec49e143da7189cb3fb5f;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/config.if b/config.if
index aa35a3f8140..2655bc3b56a 100644
--- a/config.if
+++ b/config.if
@@ -3,7 +3,6 @@
 # determine:
 #
 #	1. libstcxx_incdir: the interface name for libstdc++.
-#	2. libc_interface: the interface name for libc.
 #
 
 # Get the top level src dir.
@@ -22,58 +21,17 @@ fi
 
 # Set libstdcxx_incdir.
 # This is the same as gcc/configure.in and libstdc++-v3/acinclude.m4. 
-gcc_version_trigger=${if_topsrcdir}/gcc/version.c
-gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*"\([^"]*\)".*/\1/'`
-gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
+if test -z "$gcc_version"; then
+  if test -z "${gcc_version_trigger}" \
+     && test -f ${if_topsrcdir}/gcc/version.c; then
+    gcc_version_trigger=${if_topsrcdir}/gcc/version.c
+  fi    
+  if test -f "${gcc_version_trigger}"; then
+    gcc_version_full=`grep version_string "${gcc_version_trigger}" | sed -e 's/.*"\([^"]*\)".*/\1/'`
+  else
+    gcc_version_full=`$CC -v 2>&1 | sed -n 's/^gcc version //p'`
+  fi
+  gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
+fi
 libstdcxx_incdir=c++/${gcc_version}
 
-# The trickiest part is libc_interface.
-if [ -z "${libc_interface}" ]
-then
-  case ${target_os} in
-  *linux*libc1*|*linux*libc5*)
-    case ${target_alias} in
-    *alpha*|*powerpc*)
-      libc_interface=-libc5.9-
-      ;;
-    *)
-      libc_interface=-libc5-
-      ;;
-    esac
-    ;;
-  *linux*gnu*)
-    # We have to work harder to figure it out.
-    if [ ${target_alias} = ${build_alias} ]
-    then
-      dummy=if$$
-      cat >$dummy.c <<EOF
-#include <features.h>                      
-main(argc, argv)
-     int argc;          
-     char *argv[];
-{
-  printf("%d\n", __GLIBC_MINOR__);
-  return 0;
-}
-EOF
-      ${CC-cc} $dummy.c -o $dummy 2>/dev/null
-      if [ "$?" = 0 ]
-      then
-	libc_interface=-libc6.`./$dummy`-
-	rm -f $dummy.c $dummy
-      else
-	# It should never happen.
-	echo "Cannot find the GNU C library minor version number." >&2
-	rm -f $dummy.c $dummy
-	exit 1
-      fi
-    else
-      # Cross compiling. Assume glibc 2.1.
-      libc_interface=-libc6.1-
-    fi
-    ;;
-  *)
-    libc_interface=-
-    ;;
-  esac
-fi