mirror of
https://gcc.gnu.org/git/gcc.git
synced 2024-11-27 13:54:19 +08:00
configure.ac: Remove code setting special library locations for hppa*64*-*-hpux11*.
* configure.ac: Remove code setting special library locations for hppa*64*-*-hpux11*. Remove code setting compiler for sparc-sun-solaris2*. * configure: Regenerate. From-SVN: r173396
This commit is contained in:
parent
0360f70d36
commit
f1a0defed4
@ -1,3 +1,10 @@
|
||||
2011-05-04 Joseph Myers <joseph@codesourcery.com>
|
||||
|
||||
* configure.ac: Remove code setting special library locations for
|
||||
hppa*64*-*-hpux11*. Remove code setting compiler for
|
||||
sparc-sun-solaris2*.
|
||||
* configure: Regenerate.
|
||||
|
||||
2011-05-04 Joseph Myers <joseph@codesourcery.com>
|
||||
|
||||
* configure.ac: Separate libgloss_dir settings from general case
|
||||
|
36
configure
vendored
36
configure
vendored
@ -6849,14 +6849,6 @@ if test x${with_stabs} = x ; then
|
||||
esac
|
||||
fi
|
||||
|
||||
# hpux11 in 64bit mode has libraries in a weird place. Arrange to find
|
||||
# them automatically.
|
||||
case "${host}" in
|
||||
hppa*64*-*-hpux11*)
|
||||
extra_host_args="$extra_host_args -x-libraries=/usr/lib/pa20_64 -x-includes=/usr/X11R6/include"
|
||||
;;
|
||||
esac
|
||||
|
||||
# Some systems (e.g., one of the i386-aix systems the gas testers are
|
||||
# using) don't handle "\$" correctly, so don't use it here.
|
||||
tooldir='${exec_prefix}'/${target_noncanonical}
|
||||
@ -6900,34 +6892,6 @@ case $we_are_ok in
|
||||
esac
|
||||
rm -f conftest*
|
||||
|
||||
# The Solaris /usr/ucb/cc compiler does not appear to work.
|
||||
case "${host}" in
|
||||
sparc-sun-solaris2*)
|
||||
CCBASE="`echo ${CC-cc} | sed 's/ .*$//'`"
|
||||
if test "`type $CCBASE | sed 's/^[^/]*//'`" = "/usr/ucb/cc" ; then
|
||||
could_use=
|
||||
test -d /opt/SUNWspro/bin && could_use="/opt/SUNWspro/bin"
|
||||
if test -d /opt/cygnus/bin ; then
|
||||
if test "$could_use" = "" ; then
|
||||
could_use="/opt/cygnus/bin"
|
||||
else
|
||||
could_use="$could_use or /opt/cygnus/bin"
|
||||
fi
|
||||
fi
|
||||
if test "$could_use" = "" ; then
|
||||
echo "Warning: compilation may fail because you're using"
|
||||
echo "/usr/ucb/cc. You should change your PATH or CC "
|
||||
echo "variable and rerun configure."
|
||||
else
|
||||
echo "Warning: compilation may fail because you're using"
|
||||
echo "/usr/ucb/cc, when you should use the C compiler from"
|
||||
echo "$could_use. You should change your"
|
||||
echo "PATH or CC variable and rerun configure."
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
# Decide which environment variable is used to find dynamic libraries.
|
||||
case "${host}" in
|
||||
*-*-hpux*) RPATH_ENVVAR=SHLIB_PATH ;;
|
||||
|
36
configure.ac
36
configure.ac
@ -2334,14 +2334,6 @@ if test x${with_stabs} = x ; then
|
||||
esac
|
||||
fi
|
||||
|
||||
# hpux11 in 64bit mode has libraries in a weird place. Arrange to find
|
||||
# them automatically.
|
||||
case "${host}" in
|
||||
hppa*64*-*-hpux11*)
|
||||
extra_host_args="$extra_host_args -x-libraries=/usr/lib/pa20_64 -x-includes=/usr/X11R6/include"
|
||||
;;
|
||||
esac
|
||||
|
||||
# Some systems (e.g., one of the i386-aix systems the gas testers are
|
||||
# using) don't handle "\$" correctly, so don't use it here.
|
||||
tooldir='${exec_prefix}'/${target_noncanonical}
|
||||
@ -2385,34 +2377,6 @@ case $we_are_ok in
|
||||
esac
|
||||
rm -f conftest*
|
||||
|
||||
# The Solaris /usr/ucb/cc compiler does not appear to work.
|
||||
case "${host}" in
|
||||
sparc-sun-solaris2*)
|
||||
CCBASE="`echo ${CC-cc} | sed 's/ .*$//'`"
|
||||
if test "`type $CCBASE | sed 's/^[[^/]]*//'`" = "/usr/ucb/cc" ; then
|
||||
could_use=
|
||||
test -d /opt/SUNWspro/bin && could_use="/opt/SUNWspro/bin"
|
||||
if test -d /opt/cygnus/bin ; then
|
||||
if test "$could_use" = "" ; then
|
||||
could_use="/opt/cygnus/bin"
|
||||
else
|
||||
could_use="$could_use or /opt/cygnus/bin"
|
||||
fi
|
||||
fi
|
||||
if test "$could_use" = "" ; then
|
||||
echo "Warning: compilation may fail because you're using"
|
||||
echo "/usr/ucb/cc. You should change your PATH or CC "
|
||||
echo "variable and rerun configure."
|
||||
else
|
||||
echo "Warning: compilation may fail because you're using"
|
||||
echo "/usr/ucb/cc, when you should use the C compiler from"
|
||||
echo "$could_use. You should change your"
|
||||
echo "PATH or CC variable and rerun configure."
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
# Decide which environment variable is used to find dynamic libraries.
|
||||
case "${host}" in
|
||||
*-*-hpux*) RPATH_ENVVAR=SHLIB_PATH ;;
|
||||
|
Loading…
Reference in New Issue
Block a user