diff options
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/configure.in b/configure.in index 9ec9dc9..59d349c 100644 --- a/configure.in +++ b/configure.in @@ -148,7 +148,7 @@ host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib l # know that we are building the simulator. # binutils, gas and ld appear in that order because it makes sense to run # "make check" in that particular order. -host_tools="texinfo byacc flex bison binutils gas ld fixincludes gcc sid sim gdb make patch prms send-pr gprof etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool diff rcs fileutils shellutils time textutils wdiff find uudecode hello tar gzip indent recode release sed utils guile perl gawk findutils gettext zip fastjar" +host_tools="texinfo byacc flex bison binutils gas ld fixincludes gcc sid sim gdb make patch prms send-pr gprof etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool diff rcs fileutils shellutils time textutils wdiff find uudecode hello tar gzip indent recode release sed utils guile perl gawk findutils gettext zip fastjar gnattools" # libgcj represents the runtime libraries only used by gcj. libgcj="target-libffi \ @@ -317,6 +317,7 @@ ENABLE_LIBADA=$enableval, ENABLE_LIBADA=yes) if test "${ENABLE_LIBADA}" != "yes" ; then noconfigdirs="$noconfigdirs target-libada" + noconfigdirs="$noconfigdirs gnattools" fi # Save it here so that, even in case of --enable-libgcj, if the Java @@ -1988,7 +1989,7 @@ case " $target_configdirs " in # to it. This is right: we don't want to search that directory # for binaries, but we want the header files in there, so add # them explicitly. - FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -isystem $$r/gcc/include' + FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -isystem $$r/$(HOST_SUBDIR)/gcc/include' # Someone might think of using the pre-installed headers on # Canadian crosses, in case the installed compiler is not fully @@ -2035,13 +2036,13 @@ fi if test "x${use_gnu_ld}" = x && echo " ${configdirs} " | grep " ld " > /dev/null ; then # Arrange for us to find uninstalled linker scripts. - FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/ld' + 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/gcc/xgcc -B$$r/gcc/' + CC_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/' elif test "$host" = "$target"; then CC_FOR_TARGET='$(CC)' else @@ -2052,7 +2053,7 @@ 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/gcc/gcj -B$$r/gcc/' + GCJ_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/gcj -B$$r/$(HOST_SUBDIR)/gcc/' elif test "$host" = "$target"; then GCJ_FOR_TARGET='gcj' else @@ -2063,7 +2064,7 @@ 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/gcc/gfortran -B$$r/gcc/' + GFORTRAN_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/gfortran -B$$r/$(HOST_SUBDIR)/gcc/' elif test "$host" = "$target"; then GFORTRAN_FOR_TARGET='gfortran' else @@ -2088,8 +2089,8 @@ elif test -d ${srcdir}/gcc; then # 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/gcc/g++ -B$$r/gcc/ -nostdinc++ '$libstdcxx_flags - RAW_CXX_FOR_TARGET='$$r/gcc/xgcc -shared-libgcc -B$$r/gcc/ -nostdinc++ '$raw_libstdcxx_flags + 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} @@ -2288,7 +2289,7 @@ AC_CACHE_CHECK([if symbolic links between directories work], && rm -f confdir.s2; then gcc_cv_prog_ln_s_dir=yes else - gcc_cv_prog_ln_s_dir=yes + gcc_cv_prog_ln_s_dir=no fi rm -rf confdir.s1 confdir.s2]) |