X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=configure.in;h=c9169b6bd587096c1ae5394b56901a9753e50558;hb=12ea147810176c39f1b08a24be5cf3d440fdef05;hp=59d349cd8d20b55f1f883b67e3908bae9dd7246d;hpb=c1eb9e31184d0baca3ffbfe9b64dd6186a068ddc;p=pf3gnuchains%2Fgcc-fork.git diff --git a/configure.in b/configure.in index 59d349cd8d2..c9169b6bd58 100644 --- a/configure.in +++ b/configure.in @@ -13,14 +13,12 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ############################################################################## ### WARNING: this file contains embedded tabs. Do not run untabify on this file. sinclude(config/acx.m4) -sinclude(config/gcc-version.m4) -sinclude(config/gxx-include-dir.m4) AC_INIT(move-if-change) AC_PREREQ(2.13) @@ -101,22 +99,6 @@ topsrcdir=$srcpwd extra_host_args= -# Define the trigger file to make sure configure will re-run whenever -# the gcc version number changes. -TL_AC_GCC_VERSION([$topsrcdir]) -if test -f $gcc_version_trigger ; then - case "$ac_configure_args" in - *--with-gcc-version-trigger=$gcc_version_trigger* ) - ;; - * ) - # Add to all subconfigure arguments: build, host, and target. - ac_configure_args="$ac_configure_args --with-gcc-version-trigger=$gcc_version_trigger" - ;; - esac -else - gcc_version_trigger= -fi - ### To add a new directory to the tree, first choose whether it is a target ### or a host dependent tool. Then put it into the appropriate list ### (library or tools, host or target), doing a dependency sort. @@ -165,6 +147,7 @@ target_libraries="target-libiberty \ target-newlib \ target-libstdc++-v3 \ target-libmudflap \ + target-libssp \ target-libgfortran \ ${libgcj} \ target-libobjc \ @@ -275,6 +258,10 @@ case "${host}" in configdirs="$configdirs libtermcap" ;; esac +# A target can indicate whether a language isn't supported for some reason. +# Only spaces may be used in this macro; not newlines or tabs. +unsupported_languages= + # Remove more programs from consideration, based on the host or # target this usually means that a port of the program doesn't # exist yet. @@ -320,6 +307,14 @@ if test "${ENABLE_LIBADA}" != "yes" ; then noconfigdirs="$noconfigdirs gnattools" fi +AC_ARG_ENABLE(libssp, +[ --enable-libssp Builds libssp directory], +ENABLE_LIBSSP=$enableval, +ENABLE_LIBSSP=yes) +if test "${ENABLE_LIBSSP}" != "yes" ; then + noconfigdirs="$noconfigdirs target-libssp" +fi + # Save it here so that, even in case of --enable-libgcj, if the Java # front-end isn't enabled, we still get libgcj disabled. libgcj_saved=$libgcj @@ -366,9 +361,11 @@ case "${target}" in ;; powerpc-*-darwin*) noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes gdb gprof" + noconfigdirs="$noconfigdirs sim target-rda" ;; *-*-darwin*) - noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes gdb gprof" + noconfigdirs="$noconfigdirs ld gas gdb gprof" + noconfigdirs="$noconfigdirs sim target-rda" noconfigdirs="$noconfigdirs ${libgcj}" ;; *-*-freebsd[[12]] | *-*-freebsd[[12]].* | *-*-freebsd*aout*) @@ -416,11 +413,18 @@ case "${target}" in *-*-rtems*) noconfigdirs="$noconfigdirs target-libgloss ${libgcj}" ;; + # The tpf target doesn't support gdb yet. + *-*-tpf*) + noconfigdirs="$noconfigdirs target-newlib target-libgloss target-libiberty ${libgcj} target-libmudflap gdb tcl tk libgui itcl" + ;; *-*-uclinux*) noconfigdirs="$noconfigdirs target-newlib target-libgloss target-rda ${libgcj}" ;; *-*-vxworks*) - noconfigdirs="$noconfigdirs target-newlib target-libgloss target-libiberty ${libgcj}" + noconfigdirs="$noconfigdirs target-newlib target-libgloss target-libiberty target-libstdc++-v3 ${libgcj}" + ;; + m32c-*-*) + noconfigdirs="$noconfigdirs target-libstdc++-v3" ;; alpha*-dec-osf*) # ld works, but does not support shared libraries. @@ -471,6 +475,10 @@ case "${target}" in arm-*-elf* | strongarm-*-elf* | xscale-*-elf* | arm*-*-eabi* ) noconfigdirs="$noconfigdirs target-libffi target-qthreads" ;; + arm*-*-linux-gnueabi) + noconfigdirs="$noconfigdirs target-libffi target-qthreads" + noconfigdirs="$noconfigdirs target-libjava target-libobjc" + ;; arm*-*-symbianelf*) noconfigdirs="$noconfigdirs ${libgcj} target-libiberty" ;; @@ -492,6 +500,12 @@ case "${target}" in avr-*-*) noconfigdirs="$noconfigdirs target-libiberty target-libstdc++-v3 ${libgcj}" ;; + bfin-*-*) + noconfigdirs="$noconfigdirs target-libgloss gdb" + if test x${is_cross_compiler} != xno ; then + target_configdirs="${target_configdirs} target-bsp target-cygmon" + fi + ;; c4x-*-* | tic4x-*-*) noconfigdirs="$noconfigdirs target-libstdc++-v3 target-libgloss ${libgcj}" ;; @@ -499,10 +513,18 @@ case "${target}" in noconfigdirs="$noconfigdirs target-libstdc++-v3 target-libgloss ${libgcj} gcc gdb newlib" ;; cris-*-* | crisv32-*-*) + unsupported_languages="$unsupported_languages java" case "${target}" in - *-*-elf | *-*-aout) - noconfigdirs="$noconfigdirs ${libgcj}";; + *-*-aout) + unsupported_languages="$unsupported_languages fortran" + noconfigdirs="$noconfigdirs target-libffi target-boehm-gc";; + *-*-elf) + unsupported_languages="$unsupported_languages fortran" + noconfigdirs="$noconfigdirs target-boehm-gc";; + *-*-linux*) + noconfigdirs="$noconfigdirs target-newlib target-libgloss";; *) + unsupported_languages="$unsupported_languages fortran" noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss";; esac ;; @@ -652,7 +674,8 @@ case "${target}" in noconfigdirs="$noconfigdirs target-libstdc++-v3" ;; mmix-*-*) - noconfigdirs="$noconfigdirs ${libgcj} gdb libgloss target-libgfortran" + noconfigdirs="$noconfigdirs target-libffi target-boehm-gc gdb libgloss" + unsupported_languages="$unsupported_languages fortran java" ;; mn10200-*-*) noconfigdirs="$noconfigdirs ${libgcj}" @@ -660,9 +683,12 @@ case "${target}" in mn10300-*-*) noconfigdirs="$noconfigdirs ${libgcj}" ;; + ms1-*-*) + noconfigdirs="$noconfigdirs sim" + ;; powerpc-*-aix*) # copied from rs6000-*-* entry - noconfigdirs="$noconfigdirs gprof target-libgloss ${libgcj}" + noconfigdirs="$noconfigdirs gprof target-libgloss target-libssp ${libgcj}" ;; powerpc*-*-winnt* | powerpc*-*-pe* | ppc*-*-pe) target_configdirs="$target_configdirs target-winsup" @@ -686,7 +712,7 @@ case "${target}" in noconfigdirs="$noconfigdirs target-newlib gprof ${libgcj}" ;; rs6000-*-aix*) - noconfigdirs="$noconfigdirs gprof target-libgloss ${libgcj}" + noconfigdirs="$noconfigdirs gprof target-libgloss target-libssp ${libgcj}" ;; rs6000-*-*) noconfigdirs="$noconfigdirs gprof ${libgcj}" @@ -911,7 +937,6 @@ case "${host}" in host_makefile_frag="config/mh-cygwin" ;; *-mingw32*) - host_makefile_frag="config/mh-mingw32" ;; *-interix*) host_makefile_frag="config/mh-interix" @@ -985,10 +1010,6 @@ if test "${build}" != "${host}" ; then CXX=${CXX-${host_alias}-c++} CXXFLAGS=${CXXFLAGS-"-g -O2"} CC_FOR_BUILD=${CC_FOR_BUILD-gcc} - CC_FOR_TARGET=${CC_FOR_TARGET-${target_alias}-gcc} - CXX_FOR_TARGET=${CXX_FOR_TARGET-${target_alias}-c++} - GCJ_FOR_TARGET=${GCJ_FOR_TARGET-${target_alias}-gcj} - GCC_FOR_TARGET=${GCC_FOR_TARGET-${CC_FOR_TARGET-${target_alias}-gcc}} BUILD_PREFIX=${build_alias}- BUILD_PREFIX_1=${build_alias}- @@ -1002,7 +1023,6 @@ else # This is all going to change when we autoconfiscate... CC_FOR_BUILD="\$(CC)" - GCC_FOR_TARGET="\$(USUAL_GCC_FOR_TARGET)" BUILD_PREFIX= BUILD_PREFIX_1=loser- @@ -1044,7 +1064,7 @@ have_gmp=yes AC_ARG_WITH(mpfr-dir, [ --with-mpfr-dir=PATH Specify source directory for MPFR library]) if test "x$with_mpfr_dir" != x; then - gmpinc="-I$with_mpfr_dir/mpfr" + gmpinc="-I$with_mpfr_dir" gmplibs="$with_mpfr_dir/libmpfr.a" else gmplibs="-lmpfr" @@ -1133,6 +1153,15 @@ if test -d ${srcdir}/gcc; then fi enable_languages=`echo "${enable_languages}" | sed -e 's/[[ ,]][[ ,]]*/,/g' -e 's/,$//'` + # 'f95' is the old name for the 'fortran' language. We issue a warning + # and make the substitution. + case ,${enable_languages}, in + *,f95,*) + echo configure.in: warning: 'f95' as language name is deprecated, use 'fortran' instead 1>&2 + enable_languages=`echo "${enable_languages}" | sed -e 's/f95/fortran/g'` + ;; + esac + # First scan to see if an enabled language requires some other language. # We assume that a given config-lang.in will list all the language # front ends it requires, even if some are required indirectly. @@ -1221,7 +1250,14 @@ if test -d ${srcdir}/gcc; then add_this_lang=no ;; esac - + + # Disable a language that is unsupported by the target. + case " $unsupported_languages " in + *" $language "*) + add_this_lang=no + ;; + esac + case $add_this_lang in no) # Remove language-dependent dirs. @@ -1245,8 +1281,8 @@ if test -d ${srcdir}/gcc; then missing_languages=`echo "$missing_languages" | sed -e "s/^,//" -e "s/,$//"` if test "x$missing_languages" != x; then AC_MSG_ERROR([ -The following requested languages were not found: ${missing_languages} -The available languages are: ${potential_languages}]) +The following requested languages could not be built: ${missing_languages} +Recognised languages are: ${potential_languages}]) fi if test "x$new_enable_languages" != "x$enable_languages"; then @@ -1383,6 +1419,15 @@ esac copy_dirs= +AC_ARG_WITH([build-sysroot], + [ --with-build-sysroot=sysroot + use sysroot as the system root during the build], + [if test x"$withval" != x ; then + SYSROOT_CFLAGS_FOR_TARGET="--sysroot=$withval" + fi], + [SYSROOT_CFLAGS_FOR_TARGET=]) +AC_SUBST(SYSROOT_CFLAGS_FOR_TARGET) + # Handle --with-headers=XXX. If the value is not "yes", the contents of # the named directory are copied to $(tooldir)/sys-include. if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then @@ -1643,30 +1688,9 @@ case "${host}" in ;; esac -# If no --enable-shared nor --disable-shared is specified, we set up -# LD_LIBRARY_PATH when we build for gcc. -case $enable_shared in -"") - if test -d ${srcdir}/gcc; then - set_lib_path=yes - else - set_lib_path=no - fi - ;; -*) - set_lib_path=$enable_shared - ;; -esac - -# If --enable-shared was set, we must set LD_LIBRARY_PATH so that the -# binutils tools will find libbfd.so. -case "${set_lib_path}" in - no) SET_LIB_PATH= ;; - *) SET_LIB_PATH="\$(REALLY_SET_LIB_PATH)" ;; -esac - case "${host}" in *-*-hpux*) RPATH_ENVVAR=SHLIB_PATH ;; + *-*-darwin* | *-*-rhapsody* ) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;; *) RPATH_ENVVAR=LD_LIBRARY_PATH ;; esac @@ -1700,6 +1724,8 @@ case "$enable_gdbtk" in fi ;; esac +CONFIGURE_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-configure-/g` +INSTALL_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-install-/g` # Strip out unwanted targets. @@ -1760,18 +1786,14 @@ esac case "$enable_bootstrap" in yes) bootstrap_lean='#' - default_target=bootstrap bootstrap_suffix=bootstrap ;; lean) bootstrap_lean='' - default_target=bootstrap bootstrap_suffix=bootstrap ;; no) - default_target=all bootstrap_suffix=no-bootstrap ;; esac AC_SUBST(bootstrap_lean) -AC_SUBST(default_target) for module in ${build_configdirs} ; do if test -z "${no_recursion}" \ @@ -1963,11 +1985,10 @@ fi # fixed in future. It's still worthwhile to use a cache file for each # directory. I think. -# Pass the appropriate --host, --build, and --cache-file arguments. -target_configargs="--cache-file=./config.cache --host=${target_alias} --build=${build_alias} ${target_configargs}" - -# provide a proper gxx_include_dir. -TL_AC_GXX_INCLUDE_DIR +# Pass the appropriate --build, --host, --target and --cache-file arguments. +# We need to pass --target, as newer autoconf's requires consistency +# for target_alias and gcc doesn't manage it consistently. +target_configargs="--cache-file=./config.cache --build=${build_alias} --host=${target_alias} --target=${target_alias} ${target_configargs}" FLAGS_FOR_TARGET= case " $target_configdirs " in @@ -2039,89 +2060,6 @@ if test "x${use_gnu_ld}" = x && FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(HOST_SUBDIR)/ld' fi -if test "x${CC_FOR_TARGET+set}" = xset; then - : -elif test -d ${srcdir}/gcc; then - CC_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/' -elif test "$host" = "$target"; then - CC_FOR_TARGET='$(CC)' -else - CC_FOR_TARGET=`echo gcc | sed "${program_transform_name}"` -fi -CC_FOR_TARGET=$CC_FOR_TARGET' $(FLAGS_FOR_TARGET)' - -if test "x${GCJ_FOR_TARGET+set}" = xset; then - : -elif test -d ${srcdir}/gcc; then - GCJ_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/gcj -B$$r/$(HOST_SUBDIR)/gcc/' -elif test "$host" = "$target"; then - GCJ_FOR_TARGET='gcj' -else - GCJ_FOR_TARGET=`echo gcj | sed "${program_transform_name}"` -fi -GCJ_FOR_TARGET=$GCJ_FOR_TARGET' $(FLAGS_FOR_TARGET)' - -if test "x${GFORTRAN_FOR_TARGET+set}" = xset; then - : -elif test -d ${srcdir}/gcc; then - GFORTRAN_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/gfortran -B$$r/$(HOST_SUBDIR)/gcc/' -elif test "$host" = "$target"; then - GFORTRAN_FOR_TARGET='gfortran' -else - GFORTRAN_FOR_TARGET=`echo gfortran | sed "${program_transform_name}"` -fi -case $GFORTRAN_FOR_TARGET in -*' $(FLAGS_FOR_TARGET)') ;; -*) GFORTRAN_FOR_TARGET=$GFORTRAN_FOR_TARGET' $(FLAGS_FOR_TARGET)' ;; -esac - -# Don't use libstdc++-v3's flags to configure/build itself. -libstdcxx_flags='`test ! -f $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags || $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags --build-includes` -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs' -raw_libstdcxx_flags='-L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs' - -if test "x${CXX_FOR_TARGET+set}" = xset; then - if test "x${RAW_CXX_FOR_TARGET+set}" != xset; then - RAW_CXX_FOR_TARGET=${CXX_FOR_TARGET} - fi -elif test -d ${srcdir}/gcc; then - # We add -shared-libgcc to CXX_FOR_TARGET whenever we use xgcc instead - # of g++ for linking C++ or Java, because g++ has -shared-libgcc by - # default whereas gcc does not. - # RAW_CXX_FOR_TARGET is for linking C++ or java; CXX_FOR_TARGET is for - # all other cases. - CXX_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/g++ -B$$r/$(HOST_SUBDIR)/gcc/ -nostdinc++ '$libstdcxx_flags - RAW_CXX_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/xgcc -shared-libgcc -B$$r/$(HOST_SUBDIR)/gcc/ -nostdinc++ '$raw_libstdcxx_flags -elif test "$host" = "$target"; then - CXX_FOR_TARGET='$(CXX)' - RAW_CXX_FOR_TARGET=${CXX_FOR_TARGET} -else - CXX_FOR_TARGET=`echo c++ | sed "${program_transform_name}"` - RAW_CXX_FOR_TARGET=${CXX_FOR_TARGET} -fi -CXX_FOR_TARGET=$CXX_FOR_TARGET' $(FLAGS_FOR_TARGET)' -RAW_CXX_FOR_TARGET=$RAW_CXX_FOR_TARGET' $(FLAGS_FOR_TARGET)' - -qCXX_FOR_TARGET=`echo "$CXX_FOR_TARGET" | sed 's,[[&%]],\\\&,g'` -qRAW_CXX_FOR_TARGET=`echo "$RAW_CXX_FOR_TARGET" | sed 's,[[&%]],\\\&,g'` - -# We want to defer the evaluation of `cmd`s and shell variables in -# CXX_FOR_TARGET when recursing in the top-level Makefile, such as for -# bootstrap. We'll enclose CXX_FOR_TARGET_FOR_RECURSIVE_MAKE in single -# quotes, but we still have to duplicate `$'s so that shell variables -# can be expanded by the nested make as shell variables, not as make -# macros. -qqCXX_FOR_TARGET=`echo "$qCXX_FOR_TARGET" | sed -e 's,[[$]][[$]],$$$$,g'` -qqRAW_CXX_FOR_TARGET=`echo "$qRAW_CXX_FOR_TARGET" | sed -e 's,[[$]][[$]],$$$$,g'` - -# Wrap CC_FOR_TARGET and friends, for certain types of builds. -CC_FOR_TARGET="\$(STAGE_CC_WRAPPER) ${CC_FOR_TARGET}" -GCJ_FOR_TARGET="\$(STAGE_CC_WRAPPER) ${GCJ_FOR_TARGET}" -GFORTRAN_FOR_TARGET="\$(STAGE_CC_WRAPPER) ${GFORTRAN_FOR_TARGET}" -CXX_FOR_TARGET="\$(STAGE_CC_WRAPPER) ${qCXX_FOR_TARGET}" -RAW_CXX_FOR_TARGET="\$(STAGE_CC_WRAPPER) ${qRAW_CXX_FOR_TARGET}" -CXX_FOR_TARGET_FOR_RECURSIVE_MAKE="\$(STAGE_CC_WRAPPER) ${qqCXX_FOR_TARGET}" -RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE="\$(STAGE_CC_WRAPPER) ${qqRAW_CXX_FOR_TARGET}" - # Makefile fragments. for frag in host_makefile_frag target_makefile_frag alphaieee_frag ospace_frag; do @@ -2136,13 +2074,14 @@ AC_SUBST_FILE(alphaieee_frag) AC_SUBST_FILE(ospace_frag) # Miscellanea: directories, flags, etc. -AC_SUBST(SET_LIB_PATH) AC_SUBST(RPATH_ENVVAR) AC_SUBST(BUILD_PREFIX) AC_SUBST(BUILD_PREFIX_1) AC_SUBST(tooldir) AC_SUBST(build_tooldir) +AC_SUBST(CONFIGURE_GDB_TK) AC_SUBST(GDB_TK) +AC_SUBST(INSTALL_GDB_TK) # Build module lists & subconfigure args. AC_SUBST(build_configargs) @@ -2161,39 +2100,71 @@ AC_SUBST(CC_FOR_BUILD) AC_SUBST(config_shell) # Host tools. -NCN_STRICT_CHECK_TOOL(AR, ar) -NCN_STRICT_CHECK_TOOL(AS, as) -NCN_STRICT_CHECK_TOOL(DLLTOOL, dlltool) -NCN_STRICT_CHECK_TOOL(LD, ld) -NCN_STRICT_CHECK_TOOL(NM, nm) -NCN_STRICT_CHECK_TOOL(RANLIB, ranlib, :) -NCN_STRICT_CHECK_TOOL(WINDRES, windres) -NCN_STRICT_CHECK_TOOL(OBJCOPY, objcopy) -NCN_STRICT_CHECK_TOOL(OBJDUMP, objdump) +NCN_STRICT_CHECK_TOOLS(AR, ar) +NCN_STRICT_CHECK_TOOLS(AS, as) +NCN_STRICT_CHECK_TOOLS(DLLTOOL, dlltool) +NCN_STRICT_CHECK_TOOLS(LD, ld) +NCN_STRICT_CHECK_TOOLS(NM, nm) +NCN_STRICT_CHECK_TOOLS(RANLIB, ranlib, :) +NCN_STRICT_CHECK_TOOLS(WINDRES, windres) +NCN_STRICT_CHECK_TOOLS(OBJCOPY, objcopy) +NCN_STRICT_CHECK_TOOLS(OBJDUMP, objdump) AC_SUBST(CC) AC_SUBST(CXX) AC_SUBST(CFLAGS) AC_SUBST(CFLAGS_FOR_BUILD) AC_SUBST(CXXFLAGS) -# Target tools. -NCN_STRICT_CHECK_TARGET_TOOL(CONFIGURED_AR_FOR_TARGET, ar) -NCN_STRICT_CHECK_TARGET_TOOL(CONFIGURED_AS_FOR_TARGET, as) -NCN_STRICT_CHECK_TARGET_TOOL(CONFIGURED_DLLTOOL_FOR_TARGET, dlltool) -NCN_STRICT_CHECK_TARGET_TOOL(CONFIGURED_LD_FOR_TARGET, ld) -NCN_STRICT_CHECK_TARGET_TOOL(CONFIGURED_NM_FOR_TARGET, nm) -NCN_STRICT_CHECK_TARGET_TOOL(CONFIGURED_RANLIB_FOR_TARGET, ranlib, :) -NCN_STRICT_CHECK_TARGET_TOOL(CONFIGURED_WINDRES_FOR_TARGET, windres) - -AC_SUBST(GCC_FOR_TARGET) +# Target tools. Do the tests using the names they may have passed in +# the environment, then move it to CONFIGURED_*_FOR_TARGET. +NCN_STRICT_CHECK_TARGET_TOOLS(AR_FOR_TARGET, ar) +NCN_STRICT_CHECK_TARGET_TOOLS(AS_FOR_TARGET, as) +NCN_STRICT_CHECK_TARGET_TOOLS(CC_FOR_TARGET, cc gcc) +NCN_STRICT_CHECK_TARGET_TOOLS(CXX_FOR_TARGET, c++ g++ cxx gxx) +NCN_STRICT_CHECK_TARGET_TOOLS(DLLTOOL_FOR_TARGET, dlltool) +NCN_STRICT_CHECK_TARGET_TOOLS(GCC_FOR_TARGET, gcc, ${CC_FOR_TARGET}) +NCN_STRICT_CHECK_TARGET_TOOLS(GCJ_FOR_TARGET, gcj) +NCN_STRICT_CHECK_TARGET_TOOLS(GFORTRAN_FOR_TARGET, gfortran) +NCN_STRICT_CHECK_TARGET_TOOLS(LD_FOR_TARGET, ld) +NCN_STRICT_CHECK_TARGET_TOOLS(LIPO_FOR_TARGET, lipo) +NCN_STRICT_CHECK_TARGET_TOOLS(NM_FOR_TARGET, nm) +NCN_STRICT_CHECK_TARGET_TOOLS(OBJDUMP_FOR_TARGET, objdump) +NCN_STRICT_CHECK_TARGET_TOOLS(RANLIB_FOR_TARGET, ranlib, :) +NCN_STRICT_CHECK_TARGET_TOOLS(STRIP_FOR_TARGET, strip) +NCN_STRICT_CHECK_TARGET_TOOLS(WINDRES_FOR_TARGET, windres) + +CONFIGURED_AR_FOR_TARGET="$AR_FOR_TARGET" +CONFIGURED_AS_FOR_TARGET="$AS_FOR_TARGET" +CONFIGURED_CC_FOR_TARGET="$CC_FOR_TARGET" +CONFIGURED_CXX_FOR_TARGET="$CXX_FOR_TARGET" +CONFIGURED_DLLTOOL_FOR_TARGET="$DLLTOOL_FOR_TARGET" +CONFIGURED_GCC_FOR_TARGET="$GCC_FOR_TARGET" +CONFIGURED_GCJ_FOR_TARGET="$GCJ_FOR_TARGET" +CONFIGURED_GFORTRAN_FOR_TARGET="$GFORTRAN_FOR_TARGET" +CONFIGURED_LD_FOR_TARGET="$LD_FOR_TARGET" +CONFIGURED_LIPO_FOR_TARGET="$LIPO_FOR_TARGET" +CONFIGURED_NM_FOR_TARGET="$NM_FOR_TARGET" +CONFIGURED_OBJDUMP_FOR_TARGET="$OBJDUMP_FOR_TARGET" +CONFIGURED_RANLIB_FOR_TARGET="$RANLIB_FOR_TARGET" +CONFIGURED_STRIP_FOR_TARGET="$STRIP_FOR_TARGET" +CONFIGURED_WINDRES_FOR_TARGET="$WINDRES_FOR_TARGET" + +AC_SUBST(CONFIGURED_AR_FOR_TARGET)dnl +AC_SUBST(CONFIGURED_AS_FOR_TARGET)dnl +AC_SUBST(CONFIGURED_CC_FOR_TARGET)dnl +AC_SUBST(CONFIGURED_CXX_FOR_TARGET)dnl +AC_SUBST(CONFIGURED_DLLTOOL_FOR_TARGET)dnl +AC_SUBST(CONFIGURED_GCC_FOR_TARGET)dnl +AC_SUBST(CONFIGURED_GCJ_FOR_TARGET)dnl +AC_SUBST(CONFIGURED_GFORTRAN_FOR_TARGET)dnl +AC_SUBST(CONFIGURED_LD_FOR_TARGET)dnl +AC_SUBST(CONFIGURED_LIPO_FOR_TARGET)dnl +AC_SUBST(CONFIGURED_NM_FOR_TARGET)dnl +AC_SUBST(CONFIGURED_OBJDUMP_FOR_TARGET)dnl +AC_SUBST(CONFIGURED_RANLIB_FOR_TARGET)dnl +AC_SUBST(CONFIGURED_STRIP_FOR_TARGET)dnl +AC_SUBST(CONFIGURED_WINDRES_FOR_TARGET)dnl AC_SUBST(FLAGS_FOR_TARGET) -AC_SUBST(CC_FOR_TARGET) -AC_SUBST(GCJ_FOR_TARGET) -AC_SUBST(GFORTRAN_FOR_TARGET) -AC_SUBST(CXX_FOR_TARGET) -AC_SUBST(RAW_CXX_FOR_TARGET) -AC_SUBST(CXX_FOR_TARGET_FOR_RECURSIVE_MAKE) -AC_SUBST(RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE) # Fix up target tools. if test "x${build}" = "x${host}" ; then @@ -2205,28 +2176,41 @@ if test "x${build}" = "x${host}" ; then # should also eliminate all of this cleanly. AR_FOR_TARGET="\$(USUAL_AR_FOR_TARGET)" AS_FOR_TARGET="\$(USUAL_AS_FOR_TARGET)" + CC_FOR_TARGET="\$(USUAL_CC_FOR_TARGET)" + CXX_FOR_TARGET="\$(USUAL_CXX_FOR_TARGET)" + RAW_CXX_FOR_TARGET="\$(USUAL_RAW_CXX_FOR_TARGET)" DLLTOOL_FOR_TARGET="\$(USUAL_DLLTOOL_FOR_TARGET)" + GCC_FOR_TARGET="\$(USUAL_GCC_FOR_TARGET)" + GCJ_FOR_TARGET="\$(USUAL_GCJ_FOR_TARGET)" + GFORTRAN_FOR_TARGET="\$(USUAL_GFORTRAN_FOR_TARGET)" LD_FOR_TARGET="\$(USUAL_LD_FOR_TARGET)" + LIPO_FOR_TARGET="\$(USUAL_LIPO_FOR_TARGET)" NM_FOR_TARGET="\$(USUAL_NM_FOR_TARGET)" + OBJDUMP_FOR_TARGET="\$(USUAL_OBJDUMP_FOR_TARGET)" RANLIB_FOR_TARGET="\$(USUAL_RANLIB_FOR_TARGET)" + STRIP_FOR_TARGET="\$(USUAL_STRIP_FOR_TARGET)" WINDRES_FOR_TARGET="\$(USUAL_WINDRES_FOR_TARGET)" else # Just use the ones we found. AR_FOR_TARGET="\$(CONFIGURED_AR_FOR_TARGET)" AS_FOR_TARGET="\$(CONFIGURED_AS_FOR_TARGET)" + CC_FOR_TARGET="\$(CONFIGURED_CC_FOR_TARGET)" + CXX_FOR_TARGET="\$(CONFIGURED_CXX_FOR_TARGET)" + RAW_CXX_FOR_TARGET="\$(CONFIGURED_CXX_FOR_TARGET)" DLLTOOL_FOR_TARGET="\$(CONFIGURED_DLLTOOL_FOR_TARGET)" + GCC_FOR_TARGET="\$(CONFIGURED_GCC_FOR_TARGET)" + GCJ_FOR_TARGET="\$(CONFIGURED_GCJ_FOR_TARGET)" + GFORTRAN_FOR_TARGET="\$(CONFIGURED_GFORTRAN_FOR_TARGET)" LD_FOR_TARGET="\$(CONFIGURED_LD_FOR_TARGET)" + LIPO_FOR_TARGET="\$(CONFIGURED_LIPO_FOR_TARGET)" NM_FOR_TARGET="\$(CONFIGURED_NM_FOR_TARGET)" + OBJDUMP_FOR_TARGET="\$(CONFIGURED_OBJDUMP_FOR_TARGET)" RANLIB_FOR_TARGET="\$(CONFIGURED_RANLIB_FOR_TARGET)" + STRIP_FOR_TARGET="\$(CONFIGURED_STRIP_FOR_TARGET)" WINDRES_FOR_TARGET="\$(CONFIGURED_WINDRES_FOR_TARGET)" fi -AC_SUBST(AR_FOR_TARGET) -AC_SUBST(AS_FOR_TARGET) -AC_SUBST(DLLTOOL_FOR_TARGET) -AC_SUBST(LD_FOR_TARGET) -AC_SUBST(NM_FOR_TARGET) -AC_SUBST(RANLIB_FOR_TARGET) -AC_SUBST(WINDRES_FOR_TARGET) + +AC_SUBST(RAW_CXX_FOR_TARGET) # Certain tools may need extra flags. AR_FOR_TARGET=${AR_FOR_TARGET}${extra_arflags_for_target} @@ -2315,24 +2299,4 @@ case ${enable_werror} in esac AC_SUBST(stage2_werror_flag) -# If gcc is built natively with shared library enabled, set -# $RPATH_ENVVAR to make sure the newly built gcc shared librares are -# used. -SET_GCC_LIB_PATH= -if test -d ${srcdir}/gcc && test x${is_cross_compiler} = xno; then - case "${set_lib_path}" in - no) ;; - *) - eval "d=\$$RPATH_ENVVAR" - if test x"$d" != x; then - d="$pwd/gcc:$d" - else - d="$pwd/gcc" - fi - SET_GCC_LIB_PATH="\$(RPATH_ENVVAR)=$d; export \$(RPATH_ENVVAR);" - ;; - esac -fi -AC_SUBST(SET_GCC_LIB_PATH) - AC_OUTPUT(Makefile)