Skip to content

R
riscv-gcc-1
Commit 5f527203 by Alexandre Oliva
Options

ltconfig, [...]: Updated from libtool multi-language branch, to work around Solaris' /bin/sh bug. 

* ltconfig, ltmain.sh, libtool.m4: Updated from libtool
multi-language branch, to work around Solaris' /bin/sh bug.  Rebuilt
all affected `configure' scripts.

From-SVN: r36673
parent 3dd7094e
Showing with 35 additions and 34 deletions
boehm-gc/configure
......@@ -1796,7 +1796,7 @@ echo "configure:1796: checking how to recognise dependant libraries" >&5
if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
lt_cv_file_magic_cmd='${MAGIC}'
lt_cv_file_magic_cmd='$MAGIC_CMD'
lt_cv_file_magic_test_file=
lt_cv_deplibs_check_method='unknown'
# Need to set the preceding variable on all platforms that support
......@@ -1825,9 +1825,9 @@ bsdi4*)
lt_cv_file_magic_test_file=/shlib/libc.so
;;
cygwin* | mingw*)
cygwin* | mingw* |pw32*)
lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
lt_cv_file_magic_cmd='${OBJDUMP} -f'
lt_cv_file_magic_cmd='$OBJDUMP -f'
;;
freebsd* )
......@@ -1963,32 +1963,32 @@ ac_objext=$ac_cv_objext
# Only perform the check for file, if the check method requires it
case "$deplibs_check_method" in
file_magic*)
if test "$file_magic_cmd" = '${MAGIC}'; then
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
echo "configure:1969: checking for ${ac_tool_prefix}file" >&5
if eval "test \"`echo '$''{'lt_cv_path_MAGIC'+set}'`\" = set"; then
if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
case "$MAGIC" in
case "$MAGIC_CMD" in
/*)
lt_cv_path_MAGIC="$MAGIC" # Let the user override the test with a path.
lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
;;
?:/*)
ac_cv_path_MAGIC="$MAGIC" # Let the user override the test with a dos path.
lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
;;
*)
ac_save_MAGIC="$MAGIC"
ac_save_MAGIC_CMD="$MAGIC_CMD"
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
ac_dummy="/usr/bin:$PATH"
for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/${ac_tool_prefix}file; then
lt_cv_path_MAGIC="$ac_dir/${ac_tool_prefix}file"
lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
if test -n "$file_magic_test_file"; then
case "$deplibs_check_method" in
"file_magic "*)
file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
MAGIC="$lt_cv_path_MAGIC"
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
egrep "$file_magic_regex" > /dev/null; then
:
......@@ -2012,45 +2012,45 @@ EOF
fi
done
IFS="$ac_save_ifs"
MAGIC="$ac_save_MAGIC"
MAGIC_CMD="$ac_save_MAGIC_CMD"
;;
esac
fi
MAGIC="$lt_cv_path_MAGIC"
if test -n "$MAGIC"; then
echo "$ac_t""$MAGIC" 1>&6
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
echo "$ac_t""$MAGIC_CMD" 1>&6
else
echo "$ac_t""no" 1>&6
fi
if test -z "$lt_cv_path_MAGIC"; then
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
echo $ac_n "checking for file""... $ac_c" 1>&6
echo "configure:2031: checking for file" >&5
if eval "test \"`echo '$''{'lt_cv_path_MAGIC'+set}'`\" = set"; then
if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
case "$MAGIC" in
case "$MAGIC_CMD" in
/*)
lt_cv_path_MAGIC="$MAGIC" # Let the user override the test with a path.
lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
;;
?:/*)
ac_cv_path_MAGIC="$MAGIC" # Let the user override the test with a dos path.
lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
;;
*)
ac_save_MAGIC="$MAGIC"
ac_save_MAGIC_CMD="$MAGIC_CMD"
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
ac_dummy="/usr/bin:$PATH"
for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/file; then
lt_cv_path_MAGIC="$ac_dir/file"
lt_cv_path_MAGIC_CMD="$ac_dir/file"
if test -n "$file_magic_test_file"; then
case "$deplibs_check_method" in
"file_magic "*)
file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
MAGIC="$lt_cv_path_MAGIC"
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
egrep "$file_magic_regex" > /dev/null; then
:
......@@ -2074,20 +2074,20 @@ EOF
fi
done
IFS="$ac_save_ifs"
MAGIC="$ac_save_MAGIC"
MAGIC_CMD="$ac_save_MAGIC_CMD"
;;
esac
fi
MAGIC="$lt_cv_path_MAGIC"
if test -n "$MAGIC"; then
echo "$ac_t""$MAGIC" 1>&6
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
echo "$ac_t""$MAGIC_CMD" 1>&6
else
echo "$ac_t""no" 1>&6
fi
else
MAGIC=:
MAGIC_CMD=:
fi
fi
......@@ -2430,7 +2430,7 @@ rm -f confcache
# Actually configure libtool. ac_aux_dir is where install-sh is found.
AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
MAGIC="$MAGIC" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
......@@ -2466,7 +2466,7 @@ LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-cxx.sh"
lt_save_CC="$CC"
lt_save_CFLAGS="$CFLAGS"
AR="$AR" LTCC="$CC" CC="$CXX" CXX="$CXX" CFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \
MAGIC="$MAGIC" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
MAGIC_CMD="$MAGIC_CMD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
......@@ -2487,6 +2487,7 @@ exec 5>>./config.log
# Check whether --with-target-subdir or --without-target-subdir was given.
if test "${with_target_subdir+set}" = set; then
......@@ -2502,7 +2503,7 @@ fi
echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
echo "configure:2506: checking whether to enable maintainer-specific portions of Makefiles" >&5
echo "configure:2507: checking whether to enable maintainer-specific portions of Makefiles" >&5
# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then
enableval="$enable_maintainer_mode"
......@@ -2531,7 +2532,7 @@ if test "x" = "y"; then
echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
echo "configure:2535: checking for executable suffix" >&5
echo "configure:2536: checking for executable suffix" >&5
if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
......@@ -2541,7 +2542,7 @@ else
rm -f conftest*
echo 'int main () { return 0; }' > conftest.$ac_ext
ac_cv_exeext=
if { (eval echo configure:2545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
if { (eval echo configure:2546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
for file in conftest.*; do
case $file in
*.c | *.o | *.obj) ;;
......@@ -2564,7 +2565,7 @@ ac_exeext=$EXEEXT
fi
echo $ac_n "checking for threads package to use""... $ac_c" 1>&6
echo "configure:2568: checking for threads package to use" >&5
echo "configure:2569: checking for threads package to use" >&5
# Check whether --enable-threads or --disable-threads was given.
if test "${enable_threads+set}" = set; then
enableval="$enable_threads"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment