From e9bc61b072df081624b7287ad118be330c7de37f Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 17 Jun 2011 13:32:58 -0400 Subject: [PATCH] Fix previous change. --- configure.in | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/configure.in b/configure.in index ec0dd263b51..0135b9f1bf1 100644 --- a/configure.in +++ b/configure.in @@ -991,18 +991,6 @@ AC_SYS_LARGEFILE ## If user specified a crt-dir, use that unconditionally. if test "X$CRT_DIR" = "X"; then - ## If we're using gcc, and the user hasn't specified a crt-dir, try to - ## determine it automatically by asking gcc. [If this doesn't work, - ## CRT_DIR will remain empty and system-dependent code will be used below.] - if test "x${GCC}" = xyes; then - crt_file=`$CC --print-file-name=crt1.o 2>/dev/null` - case "$crt_file" in - */*) - CRT_DIR=`AS_DIRNAME(["$crt_file"])` - ;; - esac - fi - case "$canonical" in x86_64-*-linux-gnu* | s390x-*-linux-gnu*) ## On x86-64 and s390x GNU/Linux distributions, the standard library @@ -1025,6 +1013,18 @@ if test "X$CRT_DIR" = "X"; then ## Default is /usr/lib. test "X$CRT_DIR" = "X" && CRT_DIR=/usr/lib + ## If we're using gcc, try to determine it automatically by asking + ## gcc. [If this doesn't work, CRT_DIR will remain at the + ## system-dependent default from above.] + if test "x${GCC}" = xyes; then + crt_file=`$CC --print-file-name=crt1.o 2>/dev/null` + case "$crt_file" in + */*) + CRT_DIR=`AS_DIRNAME(["$crt_file"])` + ;; + esac + fi + else ## Some platforms don't use any of these files, so it is not -- 2.11.4.GIT