X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure;h=6a9719f60911b43a61f13bb2a267cf21941ebd84;hb=f81e7e2db6d1aaf47561e54356aee12b585533c2;hp=4cd58c9c62133af7c102d418e5887bb6cc50cb94;hpb=f948b2de97884bfb4e5fc11d40a6bea9e0b096ae;p=deliverable%2Fbinutils-gdb.git diff --git a/configure b/configure index 4cd58c9c62..6a9719f609 100755 --- a/configure +++ b/configure @@ -603,7 +603,6 @@ WINDRES_FOR_TARGET STRIP_FOR_TARGET READELF_FOR_TARGET RANLIB_FOR_TARGET -OTOOL_FOR_TARGET OBJDUMP_FOR_TARGET OBJCOPY_FOR_TARGET NM_FOR_TARGET @@ -612,14 +611,12 @@ LD_FOR_TARGET DLLTOOL_FOR_TARGET AS_FOR_TARGET AR_FOR_TARGET -GDC_FOR_TARGET GOC_FOR_TARGET GFORTRAN_FOR_TARGET GCC_FOR_TARGET CXX_FOR_TARGET CC_FOR_TARGET READELF -OTOOL OBJDUMP OBJCOPY WINDMC @@ -646,7 +643,6 @@ RANLIB_FOR_BUILD NM_FOR_BUILD LD_FOR_BUILD LDFLAGS_FOR_BUILD -GDC_FOR_BUILD GOC_FOR_BUILD GFORTRAN_FOR_BUILD DLLTOOL_FOR_BUILD @@ -806,6 +802,7 @@ with_gmp with_gmp_include with_gmp_lib with_stage1_libs +with_static_standard_libraries with_stage1_ldflags with_boot_libs with_boot_ldflags @@ -859,14 +856,12 @@ WINDRES WINDMC OBJCOPY OBJDUMP -OTOOL READELF CC_FOR_TARGET CXX_FOR_TARGET GCC_FOR_TARGET GFORTRAN_FOR_TARGET GOC_FOR_TARGET -GDC_FOR_TARGET AR_FOR_TARGET AS_FOR_TARGET DLLTOOL_FOR_TARGET @@ -875,7 +870,6 @@ LIPO_FOR_TARGET NM_FOR_TARGET OBJCOPY_FOR_TARGET OBJDUMP_FOR_TARGET -OTOOL_FOR_TARGET RANLIB_FOR_TARGET READELF_FOR_TARGET STRIP_FOR_TARGET @@ -1579,6 +1573,9 @@ Optional Packages: --with-gmp-include=PATH specify directory for installed GMP include files --with-gmp-lib=PATH specify directory for the installed GMP library --with-stage1-libs=LIBS libraries for stage1 + --with-static-standard-libraries + use -static-libstdc++ and -static-libgcc + (default=auto) --with-stage1-ldflags=FLAGS linker flags for stage1 --with-boot-libs=LIBS libraries for stage2 and later @@ -1639,7 +1636,6 @@ Some influential environment variables: WINDMC WINDMC for the host OBJCOPY OBJCOPY for the host OBJDUMP OBJDUMP for the host - OTOOL OTOOL for the host READELF READELF for the host CC_FOR_TARGET CC for the target @@ -1651,8 +1647,6 @@ Some influential environment variables: GFORTRAN for the target GOC_FOR_TARGET GOC for the target - GDC_FOR_TARGET - GDC for the target AR_FOR_TARGET AR for the target AS_FOR_TARGET @@ -1669,8 +1663,6 @@ Some influential environment variables: OBJCOPY for the target OBJDUMP_FOR_TARGET OBJDUMP for the target - OTOOL_FOR_TARGET - OTOOL for the target RANLIB_FOR_TARGET RANLIB for the target READELF_FOR_TARGET @@ -2812,9 +2804,7 @@ target_libraries="target-libgcc \ target-libffi \ target-libobjc \ target-libada \ - target-libgo \ - target-libphobos \ - target-zlib" + target-libgo" # these tools are built using the target libraries, and are intended to # run only in the target environment @@ -3395,40 +3385,6 @@ if test "${ENABLE_LIBSTDCXX}" = "default" ; then esac fi -# Disable D on systems where it is known to not work. -# For testing, you can override this with --enable-languages=d. -case ,${enable_languages}, in - *,d,*) - ;; - *) - case "${target}" in - *-*-darwin*) - unsupported_languages="$unsupported_languages d" - ;; - esac - ;; -esac - -# Disable libphobos on unsupported systems. -# For testing, you can override this with --enable-libphobos. -if test -d ${srcdir}/libphobos; then - if test x$enable_libphobos = x; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libphobos support" >&5 -$as_echo_n "checking for libphobos support... " >&6; } - if (srcdir=${srcdir}/libphobos; \ - . ${srcdir}/configure.tgt; \ - test "$LIBPHOBOS_SUPPORTED" != "yes") - then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - noconfigdirs="$noconfigdirs target-libphobos" - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - fi - fi -fi - # Disable Fortran for some systems. case "${target}" in mmix-*-*) @@ -3652,22 +3608,6 @@ case "${target}" in ;; esac -# Targets that do not use the ELF file format cannot support libctf. -case "${target}" in - *-*-pe | *-*-*vms* | *-*-darwin | *-*-*coff* | *-*-wince | *-*-mingw*) - noconfigdirs="$noconfigdirs libctf" - ;; - *-*-aout | *-*-osf* | *-*-go32 | *-*-macos* | *-*-rhapsody*) - noconfigdirs="$noconfigdirs libctf" - ;; - *-*-netbsdpe | *-*-cygwin* | *-*-pep | *-*-msdos | *-*-winnt) - noconfigdirs="$noconfigdirs libctf" - ;; - ns32k-*-* | pdp11-*-* | *-*-aix* | *-*-netbsdaout) - noconfigdirs="$noconfigdirs libctf" - ;; -esac - case "${target}" in *-*-chorusos) ;; @@ -3675,8 +3615,6 @@ case "${target}" in noconfigdirs="$noconfigdirs ld gas gdb gprof" noconfigdirs="$noconfigdirs sim target-rda" ;; - amdgcn*-*-*) - ;; arm-*-darwin*) noconfigdirs="$noconfigdirs ld gas gdb gprof" noconfigdirs="$noconfigdirs sim target-rda" @@ -4028,7 +3966,6 @@ if test "${build}" != "${host}" ; then CXX_FOR_BUILD=${CXX_FOR_BUILD-g++} GFORTRAN_FOR_BUILD=${GFORTRAN_FOR_BUILD-gfortran} GOC_FOR_BUILD=${GOC_FOR_BUILD-gccgo} - GDC_FOR_BUILD=${GDC_FOR_BUILD-gdc} DLLTOOL_FOR_BUILD=${DLLTOOL_FOR_BUILD-dlltool} LD_FOR_BUILD=${LD_FOR_BUILD-ld} NM_FOR_BUILD=${NM_FOR_BUILD-nm} @@ -4042,7 +3979,6 @@ else CXX_FOR_BUILD="\$(CXX)" GFORTRAN_FOR_BUILD="\$(GFORTRAN)" GOC_FOR_BUILD="\$(GOC)" - GDC_FOR_BUILD="\$(GDC)" DLLTOOL_FOR_BUILD="\$(DLLTOOL)" LD_FOR_BUILD="\$(LD)" NM_FOR_BUILD="\$(NM)" @@ -5892,6 +5828,23 @@ fi +# Whether or not to use -static-libstdc++ and -static-libgcc. The +# default is yes if gcc is being built; no otherwise. The reason for +# this default is that gdb is sometimes linked against GNU Source +# Highlight, which is a shared library that uses C++ exceptions. In +# this case, -static-libstdc++ will cause crashes. + +# Check whether --with-static-standard-libraries was given. +if test "${with_static_standard_libraries+set}" = set; then : + withval=$with_static_standard_libraries; +else + with_static_standard_libraries=auto +fi + +if test "$with_static_standard_libraries" = auto; then + with_static_standard_libraries=$have_compiler +fi + # Linker flags to use for stage1 or when not bootstrapping. # Check whether --with-stage1-ldflags was given. @@ -5906,7 +5859,8 @@ else # In stage 1, default to linking libstdc++ and libgcc statically with GCC # if supported. But if the user explicitly specified the libraries to use, # trust that they are doing what they want. - if test "$stage1_libs" = "" -a "$have_static_libs" = yes; then + if test "$with_static_standard_libraries" = yes -a "$stage1_libs" = "" \ + -a "$have_static_libs" = yes; then stage1_ldflags="-static-libstdc++ -static-libgcc" fi fi @@ -7252,6 +7206,14 @@ esac CONFIGURE_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-configure-/g` INSTALL_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-install-/g` +# gdb depends on gnulib, but as nothing else does, only include it if +# gdb is built. +if echo " ${configdirs} " | grep " gdb " > /dev/null 2>&1 ; then + # The Makefile provides the ordering, so it's enough here to add + # gnulib to the list. + configdirs="${configdirs} gnulib" +fi + # Strip out unwanted targets. # While at that, we remove Makefiles if we were started for recursive @@ -7784,7 +7746,6 @@ done - # Generate default definitions for YACC, M4, LEX and other programs that run # on the build machine. These are used if the Makefile can't locate these # programs in objdir. @@ -9876,147 +9837,6 @@ fi -if test -n "$OTOOL"; then - ac_cv_prog_OTOOL=$OTOOL -elif test -n "$ac_cv_prog_OTOOL"; then - OTOOL=$ac_cv_prog_OTOOL -fi - -if test -n "$ac_cv_prog_OTOOL"; then - for ncn_progname in otool; do - # Extract the first word of "${ncn_progname}", so it can be a program name with args. -set dummy ${ncn_progname}; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$OTOOL"; then - ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_OTOOL="${ncn_progname}" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -OTOOL=$ac_cv_prog_OTOOL -if test -n "$OTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 -$as_echo "$OTOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - done -fi - -for ncn_progname in otool; do - if test -n "$ncn_tool_prefix"; then - # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args. -set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$OTOOL"; then - ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_OTOOL="${ncn_tool_prefix}${ncn_progname}" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -OTOOL=$ac_cv_prog_OTOOL -if test -n "$OTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 -$as_echo "$OTOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - fi - if test -z "$ac_cv_prog_OTOOL" && test $build = $host ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. -set dummy ${ncn_progname}; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$OTOOL"; then - ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_OTOOL="${ncn_progname}" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -OTOOL=$ac_cv_prog_OTOOL -if test -n "$OTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 -$as_echo "$OTOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - fi - test -n "$ac_cv_prog_OTOOL" && break -done - -if test -z "$ac_cv_prog_OTOOL" ; then - set dummy otool - if test $build = $host ; then - OTOOL="$2" - else - OTOOL="${ncn_tool_prefix}$2" - fi -fi - - - if test -n "$READELF"; then ac_cv_prog_READELF=$READELF elif test -n "$ac_cv_prog_READELF"; then @@ -10980,167 +10800,6 @@ fi -if test -n "$GDC_FOR_TARGET"; then - ac_cv_prog_GDC_FOR_TARGET=$GDC_FOR_TARGET -elif test -n "$ac_cv_prog_GDC_FOR_TARGET"; then - GDC_FOR_TARGET=$ac_cv_prog_GDC_FOR_TARGET -fi - -if test -n "$ac_cv_prog_GDC_FOR_TARGET"; then - for ncn_progname in gdc; do - # Extract the first word of "${ncn_progname}", so it can be a program name with args. -set dummy ${ncn_progname}; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_GDC_FOR_TARGET+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$GDC_FOR_TARGET"; then - ac_cv_prog_GDC_FOR_TARGET="$GDC_FOR_TARGET" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_GDC_FOR_TARGET="${ncn_progname}" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -GDC_FOR_TARGET=$ac_cv_prog_GDC_FOR_TARGET -if test -n "$GDC_FOR_TARGET"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GDC_FOR_TARGET" >&5 -$as_echo "$GDC_FOR_TARGET" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - done -fi - -if test -z "$ac_cv_prog_GDC_FOR_TARGET" && test -n "$with_build_time_tools"; then - for ncn_progname in gdc; do - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ncn_progname} in $with_build_time_tools" >&5 -$as_echo_n "checking for ${ncn_progname} in $with_build_time_tools... " >&6; } - if test -x $with_build_time_tools/${ncn_progname}; then - ac_cv_prog_GDC_FOR_TARGET=$with_build_time_tools/${ncn_progname} - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - break - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi - done -fi - -if test -z "$ac_cv_prog_GDC_FOR_TARGET"; then - for ncn_progname in gdc; do - if test -n "$ncn_target_tool_prefix"; then - # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. -set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_GDC_FOR_TARGET+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$GDC_FOR_TARGET"; then - ac_cv_prog_GDC_FOR_TARGET="$GDC_FOR_TARGET" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_GDC_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -GDC_FOR_TARGET=$ac_cv_prog_GDC_FOR_TARGET -if test -n "$GDC_FOR_TARGET"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GDC_FOR_TARGET" >&5 -$as_echo "$GDC_FOR_TARGET" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - fi - if test -z "$ac_cv_prog_GDC_FOR_TARGET" && test $build = $target ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. -set dummy ${ncn_progname}; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_GDC_FOR_TARGET+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$GDC_FOR_TARGET"; then - ac_cv_prog_GDC_FOR_TARGET="$GDC_FOR_TARGET" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_GDC_FOR_TARGET="${ncn_progname}" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -GDC_FOR_TARGET=$ac_cv_prog_GDC_FOR_TARGET -if test -n "$GDC_FOR_TARGET"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GDC_FOR_TARGET" >&5 -$as_echo "$GDC_FOR_TARGET" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - fi - test -n "$ac_cv_prog_GDC_FOR_TARGET" && break - done -fi - -if test -z "$ac_cv_prog_GDC_FOR_TARGET" ; then - set dummy gdc - if test $build = $target ; then - GDC_FOR_TARGET="$2" - else - GDC_FOR_TARGET="${ncn_target_tool_prefix}$2" - fi -else - GDC_FOR_TARGET="$ac_cv_prog_GDC_FOR_TARGET" -fi - - - cat > conftest.c << \EOF #ifdef __GNUC__ gcc_yay; @@ -12997,236 +12656,6 @@ fi -if test -z "$ac_cv_path_OTOOL_FOR_TARGET" ; then - if test -n "$with_build_time_tools"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for otool in $with_build_time_tools" >&5 -$as_echo_n "checking for otool in $with_build_time_tools... " >&6; } - if test -x $with_build_time_tools/otool; then - OTOOL_FOR_TARGET=`cd $with_build_time_tools && pwd`/otool - ac_cv_path_OTOOL_FOR_TARGET=$OTOOL_FOR_TARGET - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_OTOOL_FOR_TARGET" >&5 -$as_echo "$ac_cv_path_OTOOL_FOR_TARGET" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi - elif test $build != $host && test $have_gcc_for_target = yes; then - OTOOL_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=otool` - test $OTOOL_FOR_TARGET = otool && OTOOL_FOR_TARGET= - test -n "$OTOOL_FOR_TARGET" && ac_cv_path_OTOOL_FOR_TARGET=$OTOOL_FOR_TARGET - fi -fi -if test -z "$ac_cv_path_OTOOL_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then - # Extract the first word of "otool", so it can be a program name with args. -set dummy otool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_OTOOL_FOR_TARGET+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $OTOOL_FOR_TARGET in - [\\/]* | ?:[\\/]*) - ac_cv_path_OTOOL_FOR_TARGET="$OTOOL_FOR_TARGET" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $gcc_cv_tool_dirs -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_OTOOL_FOR_TARGET="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -OTOOL_FOR_TARGET=$ac_cv_path_OTOOL_FOR_TARGET -if test -n "$OTOOL_FOR_TARGET"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL_FOR_TARGET" >&5 -$as_echo "$OTOOL_FOR_TARGET" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_path_OTOOL_FOR_TARGET" ; then - - -if test -n "$OTOOL_FOR_TARGET"; then - ac_cv_prog_OTOOL_FOR_TARGET=$OTOOL_FOR_TARGET -elif test -n "$ac_cv_prog_OTOOL_FOR_TARGET"; then - OTOOL_FOR_TARGET=$ac_cv_prog_OTOOL_FOR_TARGET -fi - -if test -n "$ac_cv_prog_OTOOL_FOR_TARGET"; then - for ncn_progname in otool; do - # Extract the first word of "${ncn_progname}", so it can be a program name with args. -set dummy ${ncn_progname}; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OTOOL_FOR_TARGET+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$OTOOL_FOR_TARGET"; then - ac_cv_prog_OTOOL_FOR_TARGET="$OTOOL_FOR_TARGET" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_OTOOL_FOR_TARGET="${ncn_progname}" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -OTOOL_FOR_TARGET=$ac_cv_prog_OTOOL_FOR_TARGET -if test -n "$OTOOL_FOR_TARGET"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL_FOR_TARGET" >&5 -$as_echo "$OTOOL_FOR_TARGET" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - done -fi - -if test -z "$ac_cv_prog_OTOOL_FOR_TARGET" && test -n "$with_build_time_tools"; then - for ncn_progname in otool; do - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ncn_progname} in $with_build_time_tools" >&5 -$as_echo_n "checking for ${ncn_progname} in $with_build_time_tools... " >&6; } - if test -x $with_build_time_tools/${ncn_progname}; then - ac_cv_prog_OTOOL_FOR_TARGET=$with_build_time_tools/${ncn_progname} - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - break - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi - done -fi - -if test -z "$ac_cv_prog_OTOOL_FOR_TARGET"; then - for ncn_progname in otool; do - if test -n "$ncn_target_tool_prefix"; then - # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. -set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OTOOL_FOR_TARGET+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$OTOOL_FOR_TARGET"; then - ac_cv_prog_OTOOL_FOR_TARGET="$OTOOL_FOR_TARGET" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_OTOOL_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -OTOOL_FOR_TARGET=$ac_cv_prog_OTOOL_FOR_TARGET -if test -n "$OTOOL_FOR_TARGET"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL_FOR_TARGET" >&5 -$as_echo "$OTOOL_FOR_TARGET" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - fi - if test -z "$ac_cv_prog_OTOOL_FOR_TARGET" && test $build = $target ; then - # Extract the first word of "${ncn_progname}", so it can be a program name with args. -set dummy ${ncn_progname}; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OTOOL_FOR_TARGET+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$OTOOL_FOR_TARGET"; then - ac_cv_prog_OTOOL_FOR_TARGET="$OTOOL_FOR_TARGET" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_OTOOL_FOR_TARGET="${ncn_progname}" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -OTOOL_FOR_TARGET=$ac_cv_prog_OTOOL_FOR_TARGET -if test -n "$OTOOL_FOR_TARGET"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL_FOR_TARGET" >&5 -$as_echo "$OTOOL_FOR_TARGET" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - fi - test -n "$ac_cv_prog_OTOOL_FOR_TARGET" && break - done -fi - -if test -z "$ac_cv_prog_OTOOL_FOR_TARGET" ; then - set dummy otool - if test $build = $target ; then - OTOOL_FOR_TARGET="$2" - else - OTOOL_FOR_TARGET="${ncn_target_tool_prefix}$2" - fi -else - OTOOL_FOR_TARGET="$ac_cv_prog_OTOOL_FOR_TARGET" -fi - -else - OTOOL_FOR_TARGET=$ac_cv_path_OTOOL_FOR_TARGET -fi - - - - if test -z "$ac_cv_path_RANLIB_FOR_TARGET" ; then if test -n "$with_build_time_tools"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ranlib in $with_build_time_tools" >&5 @@ -14767,51 +14196,6 @@ $as_echo "pre-installed" >&6; } fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where to find the target gdc" >&5 -$as_echo_n "checking where to find the target gdc... " >&6; } -if test "x${build}" != "x${host}" ; then - if expr "x$GDC_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - ac_dir=`dirname $GDC_FOR_TARGET` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5 -$as_echo "pre-installed in $ac_dir" >&6; } - else - # Canadian cross, just use what we found - { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5 -$as_echo "pre-installed" >&6; } - fi -else - ok=yes - case " ${configdirs} " in - *" gcc "*) ;; - *) ok=no ;; - esac - case ,${enable_languages}, in - *,d,*) ;; - *) ok=no ;; - esac - if test $ok = yes; then - # An in-tree tool is available and we can use it - GDC_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/gdc -B$$r/$(HOST_SUBDIR)/gcc/' - { $as_echo "$as_me:${as_lineno-$LINENO}: result: just compiled" >&5 -$as_echo "just compiled" >&6; } - elif expr "x$GDC_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - ac_dir=`dirname $GDC_FOR_TARGET` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5 -$as_echo "pre-installed in $ac_dir" >&6; } - elif test "x$target" = "x$host"; then - # We can use an host tool - GDC_FOR_TARGET='$(GDC)' - { $as_echo "$as_me:${as_lineno-$LINENO}: result: host tool" >&5 -$as_echo "host tool" >&6; } - else - # We need a cross tool - { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5 -$as_echo "pre-installed" >&6; } - fi -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking where to find the target ld" >&5 $as_echo_n "checking where to find the target ld... " >&6; } if test "x${build}" != "x${host}" ; then @@ -15011,37 +14395,6 @@ $as_echo "pre-installed" >&6; } fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where to find the target otool" >&5 -$as_echo_n "checking where to find the target otool... " >&6; } -if test "x${build}" != "x${host}" ; then - if expr "x$OTOOL_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - ac_dir=`dirname $OTOOL_FOR_TARGET` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5 -$as_echo "pre-installed in $ac_dir" >&6; } - else - # Canadian cross, just use what we found - { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5 -$as_echo "pre-installed" >&6; } - fi -else - if expr "x$OTOOL_FOR_TARGET" : "x/" > /dev/null; then - # We already found the complete path - ac_dir=`dirname $OTOOL_FOR_TARGET` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5 -$as_echo "pre-installed in $ac_dir" >&6; } - elif test "x$target" = "x$host"; then - # We can use an host tool - OTOOL_FOR_TARGET='$(OTOOL)' - { $as_echo "$as_me:${as_lineno-$LINENO}: result: host tool" >&5 -$as_echo "host tool" >&6; } - else - # We need a cross tool - { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5 -$as_echo "pre-installed" >&6; } - fi -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking where to find the target ranlib" >&5 $as_echo_n "checking where to find the target ranlib... " >&6; } if test "x${build}" != "x${host}" ; then