re PR bootstrap/17383 (Building in src dir fails)
2005-05-25 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/17383 * Makefile.def (target_modules): Remove "stage", now unnecessary. * Makefile.tpl (HOST_SUBDIR): New substitution. (STAGE_HOST_EXPORTS, EXPECT, HOST_LIB_PATH, USUAL_AR_FOR_TARGET, USUAL_AS_FOR_TARGET, USUAL_DLLTOOL_FOR_TARGET, USUAL_GCC_FOR_TARGET, USUAL_LD_FOR_TARGET, USUAL_NM_FOR_TARGET, USUAL_OBJDUMP_FOR_TARGET, USUAL_RANLIB_FOR_TARGET, USUAL_WINDRES_FOR_TARGET): Use it. (Host modules, Bootstrapped modules): Use it. (Build modules, Target modules): Do not create symlink trees, always configure out-of-srcdir. (distclean): Try removing $(host_subdir) with rm before using rm -rf. * configure.in (FLAGS_FOR_TARGET, CC_FOR_TARGET, GCJ_FOR_TARGET, GFORTRAN_FOR_TARGET, CXX_FOR_TARGET, RAW_CXX_FOR_TARGET): Use $(HOST_SUBDIR). Create a symlink for host_subdir. * Makefile.in: Regenerate. * configure: Regenerate. config: 2005-05-25 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/17383 * config/acx.m4 (GCC_TOPLEV_SUBDIRS): Set HOST_SUBDIR if an in-src gcc build is going. gcc: 2005-05-25 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/17383 * gcc/Makefile.in (host_subdir): New. (build_objdir): New. Replace ../$(build_subdir) with it throughout. * gcc/configure: Regenerate. libada: 2005-05-25 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/17383 * Makefile.in (GCC_DIR): Add $(HOST_SUBDIR) to the definition. libjava: 2005-05-25 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/17383 * configure.ac: Call GCC_TOPLEV_SUBDIRS. (COMPPATH): Removed. (ZIP, GCJH): Replace it with ../$(host_subdir). (built_gcc_dir): Add $(host_subdir). * configure: Regenerate. * Makefile.in, include/Makefile.in, testsuite/Makefile.in, gcj/Makefile.in, external/Makefile.in, external/sax/Makefile.in, external/w3c_dom/Makefile.in: Regenerate. libobjc: 2005-05-25 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/17383 * configure.ac: Call GCC_TOPLEV_SUBDIRS. (Determine CFLAGS for gthread): Use $host_subdir. * configure: Regenerate. * Makefile.in (host_subdir): New. (INCLUDES): Use it. From-SVN: r95680
This commit is contained in:
Paolo Bonzini
Paolo Bonzini
parent
f51d6cb4ab
commit
215c351a82
20
ChangeLog
20
ChangeLog
|
|
@ -1,3 +1,23 @@
|
|||
2005-02-28 Paolo Bonzini <bonzini@gnu.org>
|
||||
|
||||
PR bootstrap/17383
|
||||
* Makefile.def (target_modules): Remove "stage", now unnecessary.
|
||||
* Makefile.tpl (HOST_SUBDIR): New substitution.
|
||||
(STAGE_HOST_EXPORTS, EXPECT, HOST_LIB_PATH, USUAL_AR_FOR_TARGET,
|
||||
USUAL_AS_FOR_TARGET, USUAL_DLLTOOL_FOR_TARGET, USUAL_GCC_FOR_TARGET,
|
||||
USUAL_LD_FOR_TARGET, USUAL_NM_FOR_TARGET, USUAL_OBJDUMP_FOR_TARGET,
|
||||
USUAL_RANLIB_FOR_TARGET, USUAL_WINDRES_FOR_TARGET): Use it.
|
||||
(Host modules, Bootstrapped modules): Use it.
|
||||
(Build modules, Target modules): Do not create symlink trees,
|
||||
always configure out-of-srcdir.
|
||||
(distclean): Try removing $(host_subdir) with rm before using rm -rf.
|
||||
* configure.in (FLAGS_FOR_TARGET, CC_FOR_TARGET, GCJ_FOR_TARGET,
|
||||
GFORTRAN_FOR_TARGET, CXX_FOR_TARGET, RAW_CXX_FOR_TARGET): Use
|
||||
$(HOST_SUBDIR). Create a symlink for host_subdir.
|
||||
|
||||
* Makefile.in: Regenerate.
|
||||
* configure: Regenerate.
|
||||
|
||||
2005-02-28 Nathanael Nerode <neroden@gcc.gnu.org>
|
||||
|
||||
Merged from libada-gnattools-branch:
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@ target_modules = { module= libmudflap; };
|
|||
target_modules = { module= newlib; };
|
||||
target_modules = { module= libgfortran; };
|
||||
target_modules = { module= libobjc; };
|
||||
target_modules = { module= libtermcap; no_check=true; stage=true;
|
||||
target_modules = { module= libtermcap; no_check=true;
|
||||
missing=mostlyclean;
|
||||
missing=clean;
|
||||
missing=distclean;
|
||||
|
|
@ -130,7 +130,7 @@ target_modules = { module= gperf; };
|
|||
target_modules = { module= examples; no_check=true; no_install=true; };
|
||||
target_modules = { module= libffi; };
|
||||
target_modules = { module= libjava; raw_cxx=true; };
|
||||
target_modules = { module= zlib; stage=true; };
|
||||
target_modules = { module= zlib; };
|
||||
target_modules = { module= boehm-gc; };
|
||||
target_modules = { module= qthreads; };
|
||||
target_modules = { module= rda; };
|
||||
|
|
|
|||
5917
Makefile.in
5917
Makefile.in
File diff suppressed because it is too large
Load Diff
209
Makefile.tpl
209
Makefile.tpl
|
|
@ -152,6 +152,9 @@ SUBDIRS = @configdirs@
|
|||
# This is set by the configure script to the arguments to use when configuring
|
||||
# directories built for the host system.
|
||||
HOST_CONFIGARGS = @host_configargs@
|
||||
# Host programs are put under this directory, which is . except if building
|
||||
# with srcdir=..
|
||||
HOST_SUBDIR = @host_subdir@
|
||||
# This is the list of variables to export in the environment when
|
||||
# configuring subdirectories for the host system.
|
||||
HOST_EXPORTS = \
|
||||
|
|
@ -181,8 +184,12 @@ HOST_EXPORTS = \
|
|||
# Similar, for later GCC stages.
|
||||
STAGE_HOST_EXPORTS = \
|
||||
$(HOST_EXPORTS) \
|
||||
CC="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/"; export CC; \
|
||||
CC_FOR_BUILD="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/"; export CC_FOR_BUILD;
|
||||
CC="$(STAGE_CC_WRAPPER) $$r/$(HOST_SUBDIR)/prev-gcc/xgcc$(exeext) \
|
||||
-B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/"; export CC; \
|
||||
CC_FOR_BUILD="$(STAGE_CC_WRAPPER) \
|
||||
$$r/$(HOST_SUBDIR)/prev-gcc/xgcc$(exeext) \
|
||||
-B$$r/$(HOST_SUBDIR)/prev-gcc/ \
|
||||
-B$(build_tooldir)/bin/"; export CC_FOR_BUILD;
|
||||
|
||||
# This is set by the configure script to the list of directories which
|
||||
# should be built using the target tools.
|
||||
|
|
@ -305,8 +312,9 @@ MAKEINFO = `if [ -f $$r/$(BUILD_SUBDIR)/texinfo/makeinfo/Makefile ] ; \
|
|||
# (Default to avoid splitting info files by setting the threshold high.)
|
||||
MAKEINFOFLAGS = --split-size=5000000
|
||||
|
||||
EXPECT = `if [ -f $$r/expect/expect ] ; \
|
||||
then echo $$r/expect/expect ; \
|
||||
# FIXME: expect may become a build tool?
|
||||
EXPECT = `if [ -f $$r/$(HOST_SUBDIR)/expect/expect ] ; \
|
||||
then echo $$r/$(HOST_SUBDIR)/expect/expect ; \
|
||||
else echo expect ; fi`
|
||||
|
||||
RUNTEST = `if [ -f $$s/dejagnu/runtest ] ; \
|
||||
|
|
@ -319,7 +327,7 @@ RUNTEST = `if [ -f $$s/dejagnu/runtest ] ; \
|
|||
|
||||
# This is the list of directories that may be needed in RPATH_ENVVAR
|
||||
# so that programs built for the host machine work.
|
||||
HOST_LIB_PATH = $$r/bfd:$$r/opcodes
|
||||
HOST_LIB_PATH = $$r/$(HOST_SUBDIR)/bfd:$$r/$(HOST_SUBDIR)/opcodes
|
||||
|
||||
AS = @AS@
|
||||
|
||||
|
|
@ -360,8 +368,8 @@ FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@
|
|||
AR_FOR_TARGET=@AR_FOR_TARGET@
|
||||
CONFIGURED_AR_FOR_TARGET=@CONFIGURED_AR_FOR_TARGET@
|
||||
USUAL_AR_FOR_TARGET = ` \
|
||||
if [ -f $$r/binutils/ar ] ; then \
|
||||
echo $$r/binutils/ar ; \
|
||||
if [ -f $$r/$(HOST_SUBDIR)/binutils/ar ] ; then \
|
||||
echo $$r/$(HOST_SUBDIR)/binutils/ar ; \
|
||||
else \
|
||||
if [ '$(host)' = '$(target)' ] ; then \
|
||||
echo $(AR); \
|
||||
|
|
@ -373,9 +381,9 @@ USUAL_AR_FOR_TARGET = ` \
|
|||
AS_FOR_TARGET=@AS_FOR_TARGET@
|
||||
CONFIGURED_AS_FOR_TARGET=@CONFIGURED_AS_FOR_TARGET@
|
||||
USUAL_AS_FOR_TARGET = ` \
|
||||
if [ -f $$r/gas/as-new ] ; then \
|
||||
echo $$r/gas/as-new ; \
|
||||
elif [ -f $$r/gcc/xgcc ]; then \
|
||||
if [ -f $$r/$(HOST_SUBDIR)/gas/as-new ] ; then \
|
||||
echo $$r/$(HOST_SUBDIR)/gas/as-new ; \
|
||||
elif [ -f $$r/$(HOST_SUBDIR)/gcc/xgcc ]; then \
|
||||
$(CC_FOR_TARGET) -print-prog-name=as ; \
|
||||
else \
|
||||
if [ '$(host)' = '$(target)' ] ; then \
|
||||
|
|
@ -396,7 +404,8 @@ CFLAGS_FOR_TARGET = -O2 $(CFLAGS)
|
|||
# build libgcc2.a. We define it here so that it can itself be
|
||||
# overridden on the command line.
|
||||
GCC_FOR_TARGET=@GCC_FOR_TARGET@
|
||||
USUAL_GCC_FOR_TARGET = $(STAGE_CC_WRAPPER) $$r/gcc/xgcc -B$$r/gcc/ $(FLAGS_FOR_TARGET)
|
||||
USUAL_GCC_FOR_TARGET = $(STAGE_CC_WRAPPER) \
|
||||
$$r/$(HOST_SUBDIR)/gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/ $(FLAGS_FOR_TARGET)
|
||||
LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
|
||||
|
||||
CXX_FOR_TARGET = @CXX_FOR_TARGET@
|
||||
|
|
@ -409,8 +418,8 @@ LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
|
|||
DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@
|
||||
CONFIGURED_DLLTOOL_FOR_TARGET=@CONFIGURED_DLLTOOL_FOR_TARGET@
|
||||
USUAL_DLLTOOL_FOR_TARGET = ` \
|
||||
if [ -f $$r/binutils/dlltool ] ; then \
|
||||
echo $$r/binutils/dlltool ; \
|
||||
if [ -f $$r/$(HOST_SUBDIR)/binutils/dlltool ] ; then \
|
||||
echo $$r/$(HOST_SUBDIR)/binutils/dlltool ; \
|
||||
else \
|
||||
if [ '$(host)' = '$(target)' ] ; then \
|
||||
echo $(DLLTOOL); \
|
||||
|
|
@ -425,9 +434,9 @@ GFORTRAN_FOR_TARGET = @GFORTRAN_FOR_TARGET@
|
|||
LD_FOR_TARGET=@LD_FOR_TARGET@
|
||||
CONFIGURED_LD_FOR_TARGET=@CONFIGURED_LD_FOR_TARGET@
|
||||
USUAL_LD_FOR_TARGET = ` \
|
||||
if [ -f $$r/ld/ld-new ] ; then \
|
||||
echo $$r/ld/ld-new ; \
|
||||
elif [ -f $$r/gcc/xgcc ]; then \
|
||||
if [ -f $$r/$(HOST_SUBDIR)/ld/ld-new ] ; then \
|
||||
echo $$r/$(HOST_SUBDIR)/ld/ld-new ; \
|
||||
elif [ -f $$r/$(HOST_SUBDIR)/gcc/xgcc ]; then \
|
||||
$(CC_FOR_TARGET) -print-prog-name=ld ; \
|
||||
else \
|
||||
if [ '$(host)' = '$(target)' ] ; then \
|
||||
|
|
@ -442,9 +451,9 @@ LDFLAGS_FOR_TARGET =
|
|||
NM_FOR_TARGET=@NM_FOR_TARGET@
|
||||
CONFIGURED_NM_FOR_TARGET=@CONFIGURED_NM_FOR_TARGET@
|
||||
USUAL_NM_FOR_TARGET = ` \
|
||||
if [ -f $$r/binutils/nm-new ] ; then \
|
||||
echo $$r/binutils/nm-new ; \
|
||||
elif [ -f $$r/gcc/xgcc ]; then \
|
||||
if [ -f $$r/$(HOST_SUBDIR)/binutils/nm-new ] ; then \
|
||||
echo $$r/$(HOST_SUBDIR)/binutils/nm-new ; \
|
||||
elif [ -f $$r/$(HOST_SUBDIR)/gcc/xgcc ]; then \
|
||||
$(CC_FOR_TARGET) -print-prog-name=nm ; \
|
||||
else \
|
||||
if [ '$(host)' = '$(target)' ] ; then \
|
||||
|
|
@ -457,8 +466,8 @@ USUAL_NM_FOR_TARGET = ` \
|
|||
RANLIB_FOR_TARGET=@RANLIB_FOR_TARGET@
|
||||
CONFIGURED_RANLIB_FOR_TARGET=@CONFIGURED_RANLIB_FOR_TARGET@
|
||||
USUAL_RANLIB_FOR_TARGET = ` \
|
||||
if [ -f $$r/binutils/ranlib ] ; then \
|
||||
echo $$r/binutils/ranlib ; \
|
||||
if [ -f $$r/$(HOST_SUBDIR)/binutils/ranlib ] ; then \
|
||||
echo $$r/$(HOST_SUBDIR)/binutils/ranlib ; \
|
||||
else \
|
||||
if [ '$(host)' = '$(target)' ] ; then \
|
||||
if [ x'$(RANLIB)' != x ]; then \
|
||||
|
|
@ -474,8 +483,8 @@ USUAL_RANLIB_FOR_TARGET = ` \
|
|||
WINDRES_FOR_TARGET=@WINDRES_FOR_TARGET@
|
||||
CONFIGURED_WINDRES_FOR_TARGET=@CONFIGURED_WINDRES_FOR_TARGET@
|
||||
USUAL_WINDRES_FOR_TARGET = ` \
|
||||
if [ -f $$r/binutils/windres ] ; then \
|
||||
echo $$r/binutils/windres ; \
|
||||
if [ -f $$r/$(HOST_SUBDIR)/binutils/windres ] ; then \
|
||||
echo $$r/$(HOST_SUBDIR)/binutils/windres ; \
|
||||
else \
|
||||
if [ '$(host)' = '$(target)' ] ; then \
|
||||
echo $(WINDRES); \
|
||||
|
|
@ -670,6 +679,9 @@ local-distclean:
|
|||
rm -rf $(TARGET_SUBDIR); \
|
||||
else true; fi
|
||||
-rm -rf $(BUILD_SUBDIR)
|
||||
-if [ "$(HOST_SUBDIR)" != "." ]; then \
|
||||
rm -rf $(HOST_SUBDIR); \
|
||||
else true; fi
|
||||
-rm -f texinfo/po/Makefile texinfo/po/Makefile.in texinfo/info/Makefile
|
||||
-rm -f texinfo/doc/Makefile texinfo/po/POTFILES
|
||||
-rmdir texinfo/doc texinfo/info texinfo/intl texinfo/lib 2>/dev/null
|
||||
|
|
@ -822,38 +834,12 @@ configure-build-[+module+]:
|
|||
echo Configuring in $(BUILD_SUBDIR)/[+module+]; \
|
||||
cd "$(BUILD_SUBDIR)/[+module+]" || exit 1; \
|
||||
case $(srcdir) in \
|
||||
/* | [A-Za-z]:[\\/]*) \
|
||||
topdir=$(srcdir) ;; \
|
||||
*) \
|
||||
case "$(BUILD_SUBDIR)" in \
|
||||
.) topdir="../$(srcdir)" ;; \
|
||||
*) topdir="../../$(srcdir)" ;; \
|
||||
esac ;; \
|
||||
/* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
|
||||
*) topdir=`echo $(BUILD_SUBDIR)/[+module+]/ | \
|
||||
sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
|
||||
esac; \
|
||||
if [ "$(srcdir)" = "." ] ; then \
|
||||
if [ "$(BUILD_SUBDIR)" != "." ] ; then \
|
||||
if $(SHELL) $$s/symlink-tree $${topdir}/[+module+] "no-such-file" ; then \
|
||||
if [ -f Makefile ]; then \
|
||||
if $(MAKE) distclean; then \
|
||||
true; \
|
||||
else \
|
||||
exit 1; \
|
||||
fi; \
|
||||
else \
|
||||
true; \
|
||||
fi; \
|
||||
else \
|
||||
exit 1; \
|
||||
fi; \
|
||||
else \
|
||||
true; \
|
||||
fi; \
|
||||
srcdiroption="--srcdir=."; \
|
||||
libsrcdir="."; \
|
||||
else \
|
||||
srcdiroption="--srcdir=$${topdir}/[+module+]"; \
|
||||
libsrcdir="$$s/[+module+]"; \
|
||||
fi; \
|
||||
srcdiroption="--srcdir=$${topdir}/[+module+]"; \
|
||||
libsrcdir="$$s/[+module+]"; \
|
||||
rm -f no-such-file || : ; \
|
||||
CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
|
||||
$(BUILD_CONFIGARGS) $${srcdiroption} \
|
||||
|
|
@ -885,24 +871,20 @@ maybe-configure-[+module+]:
|
|||
maybe-configure-[+module+]: configure-[+module+]
|
||||
configure-[+module+]:
|
||||
@[+ IF bootstrap +]test -f stage_last && exit 0; \
|
||||
[+ ENDIF bootstrap +]test ! -f [+module+]/Makefile || exit 0; \
|
||||
[ -d [+module+] ] || mkdir [+module+]; \
|
||||
[+ ENDIF bootstrap +]test ! -f $(HOST_SUBDIR)/[+module+]/Makefile || exit 0; \
|
||||
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/[+module+] ; \
|
||||
r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(HOST_EXPORTS) \
|
||||
echo Configuring in [+module+]; \
|
||||
cd [+module+] || exit 1; \
|
||||
cd $(HOST_SUBDIR)/[+module+] || exit 1; \
|
||||
case $(srcdir) in \
|
||||
\.) \
|
||||
srcdiroption="--srcdir=."; \
|
||||
libsrcdir=".";; \
|
||||
/* | [A-Za-z]:[\\/]*) \
|
||||
srcdiroption="--srcdir=$(srcdir)/[+module+]"; \
|
||||
libsrcdir="$$s/[+module+]";; \
|
||||
*) \
|
||||
srcdiroption="--srcdir=../$(srcdir)/[+module+]"; \
|
||||
libsrcdir="$$s/[+module+]";; \
|
||||
/* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
|
||||
*) topdir=`echo $(HOST_SUBDIR)/[+module+]/ | \
|
||||
sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
|
||||
esac; \
|
||||
srcdiroption="--srcdir=$${topdir}/[+module+]"; \
|
||||
libsrcdir="$$s/[+module+]"; \
|
||||
$(SHELL) $${libsrcdir}/configure \
|
||||
$(HOST_CONFIGARGS) $${srcdiroption} [+extra_configure_flags+] \
|
||||
|| exit 1
|
||||
|
|
@ -919,8 +901,8 @@ all-[+module+]: configure-[+module+]
|
|||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(SET_LIB_PATH) \
|
||||
$(HOST_EXPORTS) \
|
||||
(cd [+module+] && $(MAKE) $(FLAGS_TO_PASS) [+extra_make_flags+] \
|
||||
$(TARGET-[+module+]))
|
||||
(cd $(HOST_SUBDIR)/[+module+] && \
|
||||
$(MAKE) $(FLAGS_TO_PASS) [+extra_make_flags+] $(TARGET-[+module+]))
|
||||
@endif [+module+]
|
||||
|
||||
.PHONY: check-[+module+] maybe-check-[+module+]
|
||||
|
|
@ -937,8 +919,8 @@ check-[+module+]:
|
|||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(SET_LIB_PATH) \
|
||||
$(HOST_EXPORTS) \
|
||||
(cd [+module+] && $(MAKE) $(FLAGS_TO_PASS) [+
|
||||
extra_make_flags+] check); \
|
||||
(cd $(HOST_SUBDIR)/[+module+] && \
|
||||
$(MAKE) $(FLAGS_TO_PASS) [+extra_make_flags+] check)
|
||||
fi
|
||||
[+ ELSE check +]
|
||||
check-[+module+]:
|
||||
|
|
@ -946,8 +928,8 @@ check-[+module+]:
|
|||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(SET_LIB_PATH) \
|
||||
$(HOST_EXPORTS) \
|
||||
(cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+
|
||||
extra_make_flags+] check)
|
||||
(cd $(HOST_SUBDIR)/[+module+] && \
|
||||
$(MAKE) $(FLAGS_TO_PASS) [+extra_make_flags+] check)
|
||||
[+ ENDIF no_check +]
|
||||
@endif [+module+]
|
||||
|
||||
|
|
@ -963,8 +945,8 @@ install-[+module+]: installdirs
|
|||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(SET_LIB_PATH) \
|
||||
$(HOST_EXPORTS) \
|
||||
(cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+
|
||||
extra_make_flags+] install)
|
||||
(cd $(HOST_SUBDIR)/[+module+] && \
|
||||
$(MAKE) $(FLAGS_TO_PASS) [+extra_make_flags+] check)
|
||||
[+ ENDIF no_install +]
|
||||
@endif [+module+]
|
||||
|
||||
|
|
@ -991,7 +973,7 @@ maybe-[+make_target+]-[+module+]: [+make_target+]-[+module+]
|
|||
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
|
||||
done; \
|
||||
echo "Doing [+make_target+] in [+module+]" ; \
|
||||
(cd [+module+] && \
|
||||
(cd $(HOST_SUBDIR)/[+module+] && \
|
||||
$(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
|
||||
"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
|
||||
"RANLIB=$${RANLIB}" \
|
||||
|
|
@ -1032,38 +1014,12 @@ ENDIF raw_cxx +]
|
|||
echo Configuring in $(TARGET_SUBDIR)/[+module+]; \
|
||||
cd "$(TARGET_SUBDIR)/[+module+]" || exit 1; \
|
||||
case $(srcdir) in \
|
||||
/* | [A-Za-z]:[\\/]*) \
|
||||
topdir=$(srcdir) ;; \
|
||||
*) \
|
||||
case "$(TARGET_SUBDIR)" in \
|
||||
.) topdir="../$(srcdir)" ;; \
|
||||
*) topdir="../../$(srcdir)" ;; \
|
||||
esac ;; \
|
||||
esac; \[+ IF stage +]
|
||||
if [ "$(srcdir)" = "." ] ; then \
|
||||
if [ "$(TARGET_SUBDIR)" != "." ] ; then \
|
||||
if $(SHELL) $$s/symlink-tree $${topdir}/[+module+] "no-such-file" ; then \
|
||||
if [ -f Makefile ]; then \
|
||||
if $(MAKE) distclean; then \
|
||||
true; \
|
||||
else \
|
||||
exit 1; \
|
||||
fi; \
|
||||
else \
|
||||
true; \
|
||||
fi; \
|
||||
else \
|
||||
exit 1; \
|
||||
fi; \
|
||||
else \
|
||||
true; \
|
||||
fi; \
|
||||
srcdiroption="--srcdir=."; \
|
||||
libsrcdir="."; \
|
||||
else \[+ ENDIF stage +]
|
||||
srcdiroption="--srcdir=$${topdir}/[+module+]"; \
|
||||
libsrcdir="$$s/[+module+]"; \[+ IF stage +]
|
||||
fi; \[+ ENDIF stage +]
|
||||
/* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
|
||||
*) topdir=`echo $(TARGET_SUBDIR)/[+module+]/ | \
|
||||
sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
|
||||
esac; \
|
||||
srcdiroption="--srcdir=$${topdir}/[+module+]"; \
|
||||
libsrcdir="$$s/[+module+]"; \
|
||||
rm -f no-such-file || : ; \
|
||||
CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
|
||||
$(TARGET_CONFIGARGS) $${srcdiroption} \
|
||||
|
|
@ -1378,18 +1334,25 @@ POSTSTAGE1_FLAGS_TO_PASS = \
|
|||
stage[+id+]-start::
|
||||
@[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
|
||||
echo stage[+id+] > stage_current ; \
|
||||
echo stage[+id+] > stage_last[+ FOR host_modules +][+ IF bootstrap +]
|
||||
echo stage[+id+] > stage_last; \
|
||||
$(mkinstalldirs) $(HOST_SUBDIR)[+
|
||||
FOR host_modules +][+ IF bootstrap +]
|
||||
@if [+ module +]
|
||||
@[ -d stage[+id+]-[+module+] ] || mkdir stage[+id+]-[+module+]; \
|
||||
set stage[+id+]-[+module+] [+module+] ; @CREATE_LINK_TO_DIR@ [+ IF prev +] ; \
|
||||
set stage[+prev+]-[+module+] prev-[+module+] ; @CREATE_LINK_TO_DIR@ [+ ENDIF prev +]
|
||||
@cd $(HOST_SUBDIR); [ -d stage[+id+]-[+module+] ] || \
|
||||
mkdir stage[+id+]-[+module+]; \
|
||||
set stage[+id+]-[+module+] [+module+] ; \
|
||||
@CREATE_LINK_TO_DIR@ [+ IF prev +] ; \
|
||||
set stage[+prev+]-[+module+] prev-[+module+] ; \
|
||||
@CREATE_LINK_TO_DIR@ [+ ENDIF prev +]
|
||||
@endif [+ module +][+ ENDIF bootstrap +][+ ENDFOR host_modules +]
|
||||
|
||||
stage[+id+]-end::
|
||||
@rm -f stage_current[+ FOR host_modules +][+ IF bootstrap +]
|
||||
@if [+ module +]
|
||||
@set [+module+] stage[+id+]-[+module+] ; @UNDO_LINK_TO_DIR@ [+ IF prev +] ; \
|
||||
set prev-[+module+] stage[+prev+]-[+module+] ; @UNDO_LINK_TO_DIR@ [+ ENDIF prev +]
|
||||
@cd $(HOST_SUBDIR); set [+module+] stage[+id+]-[+module+] ; \
|
||||
@UNDO_LINK_TO_DIR@ [+ IF prev +] ; \
|
||||
set prev-[+module+] stage[+prev+]-[+module+] ; \
|
||||
@UNDO_LINK_TO_DIR@ [+ ENDIF prev +]
|
||||
@endif [+ module +][+ ENDIF bootstrap +][+ ENDFOR host_modules +]
|
||||
|
||||
# Bubble a bugfix through all the stages up to stage [+id+]. They
|
||||
|
|
@ -1434,18 +1397,14 @@ configure-stage[+id+]-[+module+]:
|
|||
$(STAGE_HOST_EXPORTS) [+ ELSE prev +] \
|
||||
$(HOST_EXPORTS) [+ ENDIF prev +] \
|
||||
echo Configuring stage [+id+] in [+module+] ; \
|
||||
cd [+module+] || exit 1; \
|
||||
cd $(HOST_SUBDIR)/[+module+] || exit 1; \
|
||||
case $(srcdir) in \
|
||||
\.) \
|
||||
srcdiroption="--srcdir=."; \
|
||||
libsrcdir=".";; \
|
||||
/* | [A-Za-z]:[\\/]*) \
|
||||
srcdiroption="--srcdir=$(srcdir)/[+module+]"; \
|
||||
libsrcdir="$$s/[+module+]";; \
|
||||
*) \
|
||||
srcdiroption="--srcdir=../$(srcdir)/[+module+]"; \
|
||||
libsrcdir="$$s/[+module+]";; \
|
||||
/* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
|
||||
*) topdir=`echo $(HOST_SUBDIR)/[+module+]/ | \
|
||||
sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
|
||||
esac; \
|
||||
srcdiroption="--srcdir=$${topdir}/[+module+]"; \
|
||||
libsrcdir="$$s/[+module+]"; \
|
||||
$(SHELL) $${libsrcdir}/configure \
|
||||
$(HOST_CONFIGARGS) $${srcdiroption} \
|
||||
[+stage_configure_flags+] [+extra_configure_flags+]
|
||||
|
|
@ -1457,7 +1416,7 @@ all-stage[+id+]-[+module+]: configure-stage[+id+]-[+module+]
|
|||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; [+ IF prev +] \
|
||||
$(STAGE_HOST_EXPORTS) [+ ELSE prev +] \
|
||||
$(HOST_EXPORTS) [+ ENDIF prev +] \
|
||||
cd [+module+] && \
|
||||
cd $(HOST_SUBDIR)/[+module+] && \
|
||||
$(MAKE) $(FLAGS_TO_PASS) [+ IF prev +] \
|
||||
$(POSTSTAGE1_FLAGS_TO_PASS) [+ ENDIF prev +] \
|
||||
[+stage_make_flags+] [+extra_make_flags+]
|
||||
|
|
@ -1467,7 +1426,7 @@ clean-stage[+id+]-[+module+]:
|
|||
@[ -f [+module+]/Makefile ] || [ -f stage[+id+]-[+module+]/Makefile ] \
|
||||
|| exit 0 ; \
|
||||
[ -f [+module+]/Makefile ] || $(MAKE) stage[+id+]-start ; \
|
||||
cd [+module+] && \
|
||||
cd $(HOST_SUBDIR)/[+module+] && \
|
||||
$(MAKE) $(FLAGS_TO_PASS) [+ IF prev +] \
|
||||
$(POSTSTAGE1_FLAGS_TO_PASS) [+ ENDIF prev +] \
|
||||
[+stage_make_flags+] [+extra_make_flags+] clean
|
||||
|
|
|
|||
|
|
@ -1,3 +1,9 @@
|
|||
2005-02-28 Paolo Bonzini <bonzini@gnu.org>
|
||||
|
||||
PR bootstrap/17383
|
||||
* acx.m4 (GCC_TOPLEV_SUBDIRS): Set HOST_SUBDIR if an in-src
|
||||
gcc build is going.
|
||||
|
||||
2005-01-23 Joseph S. Myers <joseph@codesourcery.com>
|
||||
|
||||
* warnings.m4 (ACX_PROG_CC_WARNING_ALMOST_PEDANTIC): Don't do
|
||||
|
|
|
|||
|
|
@ -76,8 +76,13 @@ AC_DEFUN([GCC_TOPLEV_SUBDIRS],
|
|||
AC_REQUIRE([_GCC_TOPLEV_NONCANONICAL_BUILD]) []dnl
|
||||
# Prefix 'build-' so this never conflicts with target_subdir.
|
||||
build_subdir="build-${build_noncanonical}"
|
||||
# Not really a subdirectory, but here for completeness.
|
||||
host_subdir=.
|
||||
# --srcdir=. covers the toplevel, while "test -d" covers the subdirectories
|
||||
if ( test $srcdir = . && test -d gcc ) \
|
||||
|| test -d $srcdir/../host-${host_noncanonical}; then
|
||||
host_subdir="host-${host_noncanonical}"
|
||||
else
|
||||
host_subdir=.
|
||||
fi
|
||||
# No prefix.
|
||||
target_subdir=${target_noncanonical}
|
||||
AC_SUBST([build_subdir]) []dnl
|
||||
|
|
|
|||
|
|
@ -989,8 +989,13 @@ esac
|
|||
|
||||
# Prefix 'build-' so this never conflicts with target_subdir.
|
||||
build_subdir="build-${build_noncanonical}"
|
||||
# Not really a subdirectory, but here for completeness.
|
||||
host_subdir=.
|
||||
# --srcdir=. covers the toplevel, while "test -d" covers the subdirectories
|
||||
if ( test $srcdir = . && test -d gcc ) \
|
||||
|| test -d $srcdir/../host-${host_noncanonical}; then
|
||||
host_subdir="host-${host_noncanonical}"
|
||||
else
|
||||
host_subdir=.
|
||||
fi
|
||||
# No prefix.
|
||||
target_subdir=${target_noncanonical}
|
||||
|
||||
|
|
@ -1800,7 +1805,7 @@ else
|
|||
# Extract the first word of "gcc", so it can be a program name with args.
|
||||
set dummy gcc; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:1804: checking for $ac_word" >&5
|
||||
echo "configure:1809: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1830,7 +1835,7 @@ if test -z "$CC"; then
|
|||
# Extract the first word of "cc", so it can be a program name with args.
|
||||
set dummy cc; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:1834: checking for $ac_word" >&5
|
||||
echo "configure:1839: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1881,7 +1886,7 @@ fi
|
|||
# Extract the first word of "cl", so it can be a program name with args.
|
||||
set dummy cl; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:1885: checking for $ac_word" >&5
|
||||
echo "configure:1890: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1913,7 +1918,7 @@ fi
|
|||
fi
|
||||
|
||||
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
|
||||
echo "configure:1917: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
|
||||
echo "configure:1922: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
|
||||
|
||||
ac_ext=c
|
||||
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
|
||||
|
|
@ -1924,12 +1929,12 @@ cross_compiling=$ac_cv_prog_cc_cross
|
|||
|
||||
cat > conftest.$ac_ext << EOF
|
||||
|
||||
#line 1928 "configure"
|
||||
#line 1933 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
main(){return(0);}
|
||||
EOF
|
||||
if { (eval echo configure:1933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
ac_cv_prog_cc_works=yes
|
||||
# If we can't run a trivial program, we are probably using a cross compiler.
|
||||
if (./conftest; exit) 2>/dev/null; then
|
||||
|
|
@ -1955,12 +1960,12 @@ if test $ac_cv_prog_cc_works = no; then
|
|||
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
|
||||
fi
|
||||
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
|
||||
echo "configure:1959: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
|
||||
echo "configure:1964: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
|
||||
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
|
||||
cross_compiling=$ac_cv_prog_cc_cross
|
||||
|
||||
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
|
||||
echo "configure:1964: checking whether we are using GNU C" >&5
|
||||
echo "configure:1969: checking whether we are using GNU C" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1969,7 +1974,7 @@ else
|
|||
yes;
|
||||
#endif
|
||||
EOF
|
||||
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1973: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
|
||||
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1978: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
|
||||
ac_cv_prog_gcc=yes
|
||||
else
|
||||
ac_cv_prog_gcc=no
|
||||
|
|
@ -1988,7 +1993,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
|
|||
ac_save_CFLAGS="$CFLAGS"
|
||||
CFLAGS=
|
||||
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
|
||||
echo "configure:1992: checking whether ${CC-cc} accepts -g" >&5
|
||||
echo "configure:1997: checking whether ${CC-cc} accepts -g" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -2055,7 +2060,7 @@ fi
|
|||
# Extract the first word of "${ac_tool_prefix}gnatbind", so it can be a program name with args.
|
||||
set dummy ${ac_tool_prefix}gnatbind; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:2059: checking for $ac_word" >&5
|
||||
echo "configure:2064: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_GNATBIND'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -2087,7 +2092,7 @@ if test -n "$ac_tool_prefix"; then
|
|||
# Extract the first word of "gnatbind", so it can be a program name with args.
|
||||
set dummy gnatbind; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:2091: checking for $ac_word" >&5
|
||||
echo "configure:2096: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_GNATBIND'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -2120,7 +2125,7 @@ fi
|
|||
fi
|
||||
|
||||
echo $ac_n "checking whether compiler driver understands Ada""... $ac_c" 1>&6
|
||||
echo "configure:2124: checking whether compiler driver understands Ada" >&5
|
||||
echo "configure:2129: checking whether compiler driver understands Ada" >&5
|
||||
if eval "test \"`echo '$''{'acx_cv_cc_gcc_supports_ada'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -2153,7 +2158,7 @@ else
|
|||
fi
|
||||
|
||||
echo $ac_n "checking how to compare bootstrapped objects""... $ac_c" 1>&6
|
||||
echo "configure:2157: checking how to compare bootstrapped objects" >&5
|
||||
echo "configure:2162: checking how to compare bootstrapped objects" >&5
|
||||
if eval "test \"`echo '$''{'gcc_cv_prog_cmp_skip'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -2251,9 +2256,9 @@ saved_CFLAGS="$CFLAGS"
|
|||
CFLAGS="$CFLAGS $gmpinc"
|
||||
# Check GMP actually works
|
||||
echo $ac_n "checking for correct version of gmp.h""... $ac_c" 1>&6
|
||||
echo "configure:2255: checking for correct version of gmp.h" >&5
|
||||
echo "configure:2260: checking for correct version of gmp.h" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2257 "configure"
|
||||
#line 2262 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "gmp.h"
|
||||
int main() {
|
||||
|
|
@ -2264,7 +2269,7 @@ choke me
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2268: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:2273: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
echo "$ac_t""yes" 1>&6
|
||||
else
|
||||
|
|
@ -2277,12 +2282,12 @@ rm -f conftest*
|
|||
|
||||
if test x"$have_gmp" = xyes; then
|
||||
echo $ac_n "checking for MPFR""... $ac_c" 1>&6
|
||||
echo "configure:2281: checking for MPFR" >&5
|
||||
echo "configure:2286: checking for MPFR" >&5
|
||||
|
||||
saved_LIBS="$LIBS"
|
||||
LIBS="$LIBS $gmplibs"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2286 "configure"
|
||||
#line 2291 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <gmp.h>
|
||||
#include <mpfr.h>
|
||||
|
|
@ -2290,7 +2295,7 @@ int main() {
|
|||
mpfr_t n; mpfr_init(n);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
echo "$ac_t""yes" 1>&6
|
||||
else
|
||||
|
|
@ -2777,7 +2782,7 @@ do
|
|||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:2781: checking for $ac_word" >&5
|
||||
echo "configure:2786: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_BISON'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -2812,7 +2817,7 @@ do
|
|||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:2816: checking for $ac_word" >&5
|
||||
echo "configure:2821: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_YACC'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -2847,7 +2852,7 @@ do
|
|||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:2851: checking for $ac_word" >&5
|
||||
echo "configure:2856: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_M4'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -2882,7 +2887,7 @@ do
|
|||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:2886: checking for $ac_word" >&5
|
||||
echo "configure:2891: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_FLEX'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -2917,7 +2922,7 @@ do
|
|||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:2921: checking for $ac_word" >&5
|
||||
echo "configure:2926: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_LEX'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -2952,7 +2957,7 @@ do
|
|||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:2956: checking for $ac_word" >&5
|
||||
echo "configure:2961: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_MAKEINFO'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3417,7 +3422,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
|
||||
|
|
@ -3464,13 +3469,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
|
||||
|
|
@ -3481,7 +3486,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
|
||||
|
|
@ -3492,7 +3497,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
|
||||
|
|
@ -3517,8 +3522,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}
|
||||
|
|
@ -3598,7 +3603,7 @@ test -n "$target_alias" && ncn_target_tool_prefix=$target_alias-
|
|||
# Extract the first word of "${ncn_tool_prefix}ar", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}ar; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3602: checking for $ac_word" >&5
|
||||
echo "configure:3607: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3631,7 +3636,7 @@ if test -z "$ac_cv_prog_AR" ; then
|
|||
# Extract the first word of "ar", so it can be a program name with args.
|
||||
set dummy ar; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3635: checking for $ac_word" >&5
|
||||
echo "configure:3640: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AR'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3670,7 +3675,7 @@ fi
|
|||
# Extract the first word of "${ncn_tool_prefix}as", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}as; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3674: checking for $ac_word" >&5
|
||||
echo "configure:3679: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3703,7 +3708,7 @@ if test -z "$ac_cv_prog_AS" ; then
|
|||
# Extract the first word of "as", so it can be a program name with args.
|
||||
set dummy as; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3707: checking for $ac_word" >&5
|
||||
echo "configure:3712: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AS'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3742,7 +3747,7 @@ fi
|
|||
# Extract the first word of "${ncn_tool_prefix}dlltool", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}dlltool; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3746: checking for $ac_word" >&5
|
||||
echo "configure:3751: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3775,7 +3780,7 @@ if test -z "$ac_cv_prog_DLLTOOL" ; then
|
|||
# Extract the first word of "dlltool", so it can be a program name with args.
|
||||
set dummy dlltool; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3779: checking for $ac_word" >&5
|
||||
echo "configure:3784: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_DLLTOOL'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3814,7 +3819,7 @@ fi
|
|||
# Extract the first word of "${ncn_tool_prefix}ld", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}ld; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3818: checking for $ac_word" >&5
|
||||
echo "configure:3823: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3847,7 +3852,7 @@ if test -z "$ac_cv_prog_LD" ; then
|
|||
# Extract the first word of "ld", so it can be a program name with args.
|
||||
set dummy ld; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3851: checking for $ac_word" >&5
|
||||
echo "configure:3856: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_LD'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3886,7 +3891,7 @@ fi
|
|||
# Extract the first word of "${ncn_tool_prefix}nm", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}nm; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3890: checking for $ac_word" >&5
|
||||
echo "configure:3895: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3919,7 +3924,7 @@ if test -z "$ac_cv_prog_NM" ; then
|
|||
# Extract the first word of "nm", so it can be a program name with args.
|
||||
set dummy nm; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3923: checking for $ac_word" >&5
|
||||
echo "configure:3928: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_NM'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3958,7 +3963,7 @@ fi
|
|||
# Extract the first word of "${ncn_tool_prefix}ranlib", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}ranlib; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3962: checking for $ac_word" >&5
|
||||
echo "configure:3967: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3991,7 +3996,7 @@ if test -z "$ac_cv_prog_RANLIB" ; then
|
|||
# Extract the first word of "ranlib", so it can be a program name with args.
|
||||
set dummy ranlib; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3995: checking for $ac_word" >&5
|
||||
echo "configure:4000: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_RANLIB'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4030,7 +4035,7 @@ fi
|
|||
# Extract the first word of "${ncn_tool_prefix}windres", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}windres; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4034: checking for $ac_word" >&5
|
||||
echo "configure:4039: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4063,7 +4068,7 @@ if test -z "$ac_cv_prog_WINDRES" ; then
|
|||
# Extract the first word of "windres", so it can be a program name with args.
|
||||
set dummy windres; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4067: checking for $ac_word" >&5
|
||||
echo "configure:4072: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_WINDRES'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4102,7 +4107,7 @@ fi
|
|||
# Extract the first word of "${ncn_tool_prefix}objcopy", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}objcopy; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4106: checking for $ac_word" >&5
|
||||
echo "configure:4111: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4135,7 +4140,7 @@ if test -z "$ac_cv_prog_OBJCOPY" ; then
|
|||
# Extract the first word of "objcopy", so it can be a program name with args.
|
||||
set dummy objcopy; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4139: checking for $ac_word" >&5
|
||||
echo "configure:4144: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_OBJCOPY'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4174,7 +4179,7 @@ fi
|
|||
# Extract the first word of "${ncn_tool_prefix}objdump", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}objdump; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4178: checking for $ac_word" >&5
|
||||
echo "configure:4183: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4207,7 +4212,7 @@ if test -z "$ac_cv_prog_OBJDUMP" ; then
|
|||
# Extract the first word of "objdump", so it can be a program name with args.
|
||||
set dummy objdump; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4211: checking for $ac_word" >&5
|
||||
echo "configure:4216: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_OBJDUMP'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4253,7 +4258,7 @@ fi
|
|||
# Extract the first word of "${ncn_target_tool_prefix}ar", so it can be a program name with args.
|
||||
set dummy ${ncn_target_tool_prefix}ar; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4257: checking for $ac_word" >&5
|
||||
echo "configure:4262: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_AR_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4286,7 +4291,7 @@ if test -z "$ac_cv_prog_CONFIGURED_AR_FOR_TARGET" ; then
|
|||
# Extract the first word of "ar", so it can be a program name with args.
|
||||
set dummy ar; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4290: checking for $ac_word" >&5
|
||||
echo "configure:4295: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_AR_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4325,7 +4330,7 @@ fi
|
|||
# Extract the first word of "${ncn_target_tool_prefix}as", so it can be a program name with args.
|
||||
set dummy ${ncn_target_tool_prefix}as; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4329: checking for $ac_word" >&5
|
||||
echo "configure:4334: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_AS_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4358,7 +4363,7 @@ if test -z "$ac_cv_prog_CONFIGURED_AS_FOR_TARGET" ; then
|
|||
# Extract the first word of "as", so it can be a program name with args.
|
||||
set dummy as; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4362: checking for $ac_word" >&5
|
||||
echo "configure:4367: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_AS_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4397,7 +4402,7 @@ fi
|
|||
# Extract the first word of "${ncn_target_tool_prefix}dlltool", so it can be a program name with args.
|
||||
set dummy ${ncn_target_tool_prefix}dlltool; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4401: checking for $ac_word" >&5
|
||||
echo "configure:4406: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4430,7 +4435,7 @@ if test -z "$ac_cv_prog_CONFIGURED_DLLTOOL_FOR_TARGET" ; then
|
|||
# Extract the first word of "dlltool", so it can be a program name with args.
|
||||
set dummy dlltool; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4434: checking for $ac_word" >&5
|
||||
echo "configure:4439: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4469,7 +4474,7 @@ fi
|
|||
# Extract the first word of "${ncn_target_tool_prefix}ld", so it can be a program name with args.
|
||||
set dummy ${ncn_target_tool_prefix}ld; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4473: checking for $ac_word" >&5
|
||||
echo "configure:4478: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_LD_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4502,7 +4507,7 @@ if test -z "$ac_cv_prog_CONFIGURED_LD_FOR_TARGET" ; then
|
|||
# Extract the first word of "ld", so it can be a program name with args.
|
||||
set dummy ld; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4506: checking for $ac_word" >&5
|
||||
echo "configure:4511: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_LD_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4541,7 +4546,7 @@ fi
|
|||
# Extract the first word of "${ncn_target_tool_prefix}nm", so it can be a program name with args.
|
||||
set dummy ${ncn_target_tool_prefix}nm; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4545: checking for $ac_word" >&5
|
||||
echo "configure:4550: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_NM_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4574,7 +4579,7 @@ if test -z "$ac_cv_prog_CONFIGURED_NM_FOR_TARGET" ; then
|
|||
# Extract the first word of "nm", so it can be a program name with args.
|
||||
set dummy nm; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4578: checking for $ac_word" >&5
|
||||
echo "configure:4583: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_NM_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4613,7 +4618,7 @@ fi
|
|||
# Extract the first word of "${ncn_target_tool_prefix}ranlib", so it can be a program name with args.
|
||||
set dummy ${ncn_target_tool_prefix}ranlib; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4617: checking for $ac_word" >&5
|
||||
echo "configure:4622: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_RANLIB_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4646,7 +4651,7 @@ if test -z "$ac_cv_prog_CONFIGURED_RANLIB_FOR_TARGET" ; then
|
|||
# Extract the first word of "ranlib", so it can be a program name with args.
|
||||
set dummy ranlib; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4650: checking for $ac_word" >&5
|
||||
echo "configure:4655: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_RANLIB_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4685,7 +4690,7 @@ fi
|
|||
# Extract the first word of "${ncn_target_tool_prefix}windres", so it can be a program name with args.
|
||||
set dummy ${ncn_target_tool_prefix}windres; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4689: checking for $ac_word" >&5
|
||||
echo "configure:4694: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_WINDRES_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4718,7 +4723,7 @@ if test -z "$ac_cv_prog_CONFIGURED_WINDRES_FOR_TARGET" ; then
|
|||
# Extract the first word of "windres", so it can be a program name with args.
|
||||
set dummy windres; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4722: checking for $ac_word" >&5
|
||||
echo "configure:4727: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_WINDRES_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4803,7 +4808,7 @@ RANLIB_FOR_TARGET=${RANLIB_FOR_TARGET}${extra_ranlibflags_for_target}
|
|||
NM_FOR_TARGET=${NM_FOR_TARGET}${extra_nmflags_for_target}
|
||||
|
||||
echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
|
||||
echo "configure:4807: checking whether to enable maintainer-specific portions of Makefiles" >&5
|
||||
echo "configure:4812: 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"
|
||||
|
|
@ -4850,7 +4855,7 @@ esac
|
|||
# gcc for stageN-gcc and stagePREV-gcc for stage(N-1). In case this is not
|
||||
# possible, however, we can resort to mv.
|
||||
echo $ac_n "checking if symbolic links between directories work""... $ac_c" 1>&6
|
||||
echo "configure:4854: checking if symbolic links between directories work" >&5
|
||||
echo "configure:4859: checking if symbolic links between directories work" >&5
|
||||
if eval "test \"`echo '$''{'gcc_cv_prog_ln_s_dir'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4864,7 +4869,7 @@ else
|
|||
&& 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
|
||||
fi
|
||||
|
|
|
|||
16
configure.in
16
configure.in
|
|
@ -1989,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
|
||||
|
|
@ -2036,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
|
||||
|
|
@ -2053,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
|
||||
|
|
@ -2064,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
|
||||
|
|
@ -2089,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}
|
||||
|
|
@ -2289,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])
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,10 @@
|
|||
2005-02-28 Paolo Bonzini <bonzini@gnu.org>
|
||||
|
||||
PR bootstrap/17383
|
||||
* Makefile.in (host_subdir): New.
|
||||
(build_objdir): New. Replace ../$(build_subdir) with it throughout.
|
||||
* configure: Regenerate.
|
||||
|
||||
2005-02-27 Zack Weinberg <zack@codesourcery.com>
|
||||
|
||||
* config/alpha/t-osf4, config/arm/t-netbsd, config/ia64/t-hpux
|
||||
|
|
|
|||
|
|
@ -83,8 +83,15 @@ top_builddir = .
|
|||
# It's normally the absolute path to the current directory.
|
||||
objdir = @objdir@
|
||||
|
||||
host_subdir=@host_subdir@
|
||||
build_subdir=@build_subdir@
|
||||
|
||||
ifeq ($(host_subdir),.)
|
||||
build_objdir := ../$(build_subdir)
|
||||
else
|
||||
build_objdir := ../../$(build_subdir)
|
||||
endif
|
||||
|
||||
# --------
|
||||
# Defined vpaths
|
||||
# --------
|
||||
|
|
@ -756,7 +763,7 @@ ALL_CPPFLAGS = $(CPPFLAGS) $(X_CPPFLAGS) $(T_CPPFLAGS)
|
|||
|
||||
# Build and host support libraries.
|
||||
LIBIBERTY = ../libiberty/libiberty.a
|
||||
BUILD_LIBIBERTY = ../$(build_subdir)/libiberty/libiberty.a
|
||||
BUILD_LIBIBERTY = $(build_objdir)/libiberty/libiberty.a
|
||||
|
||||
# Dependencies on the intl and portability libraries.
|
||||
LIBDEPS= $(CPPLIB) $(LIBIBERTY) $(LIBINTL_DEP) $(LIBICONV_DEP)
|
||||
|
|
@ -2829,8 +2836,8 @@ s-macro_list : $(GCC_PASSES)
|
|||
|
||||
# Build fixed copies of system files.
|
||||
stmp-fixinc: gsyslimits.h macro_list \
|
||||
../$(build_subdir)/fixincludes/fixincl \
|
||||
../$(build_subdir)/fixincludes/fixinc.sh
|
||||
$(build_objdir)/fixincludes/fixincl \
|
||||
$(build_objdir)/fixincludes/fixinc.sh
|
||||
@if test ! -d ${SYSTEM_HEADER_DIR}; then \
|
||||
echo The directory that should contain system headers does not exist: >&2 ; \
|
||||
echo " ${SYSTEM_HEADER_DIR}" >&2 ; \
|
||||
|
|
@ -2842,7 +2849,7 @@ stmp-fixinc: gsyslimits.h macro_list \
|
|||
(TARGET_MACHINE='$(target)'; srcdir=`cd $(srcdir); ${PWD_COMMAND}`; \
|
||||
SHELL='$(SHELL)'; MACRO_LIST=`${PWD_COMMAND}`/macro_list ; \
|
||||
export TARGET_MACHINE srcdir SHELL MACRO_LIST && \
|
||||
cd ../$(build_subdir)/fixincludes && \
|
||||
cd $(build_objdir)/fixincludes && \
|
||||
$(SHELL) ./fixinc.sh ../../gcc/include \
|
||||
$(SYSTEM_HEADER_DIR) $(OTHER_FIXINCLUDES_DIRS) )
|
||||
rm -f include/syslimits.h
|
||||
|
|
|
|||
|
|
@ -1032,7 +1032,7 @@ esac
|
|||
else
|
||||
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
|
||||
fi
|
||||
cd "$ac_popdir"
|
||||
cd $ac_popdir
|
||||
done
|
||||
fi
|
||||
|
||||
|
|
@ -1517,8 +1517,13 @@ esac
|
|||
# Determine the target- and build-specific subdirectories
|
||||
# Prefix 'build-' so this never conflicts with target_subdir.
|
||||
build_subdir="build-${build_noncanonical}"
|
||||
# Not really a subdirectory, but here for completeness.
|
||||
host_subdir=.
|
||||
# --srcdir=. covers the toplevel, while "test -d" covers the subdirectories
|
||||
if ( test $srcdir = . && test -d gcc ) \
|
||||
|| test -d $srcdir/../host-${host_noncanonical}; then
|
||||
host_subdir="host-${host_noncanonical}"
|
||||
else
|
||||
host_subdir=.
|
||||
fi
|
||||
# No prefix.
|
||||
target_subdir=${target_noncanonical}
|
||||
|
||||
|
|
@ -2401,7 +2406,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -2459,7 +2465,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -2575,7 +2582,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -2629,7 +2637,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -2674,7 +2683,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -2718,7 +2728,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -3140,7 +3151,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -3211,7 +3223,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -3270,7 +3283,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -3352,7 +3366,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -3522,7 +3537,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -3587,7 +3603,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -3649,7 +3666,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -3689,7 +3707,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -3745,7 +3764,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -3785,7 +3805,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -3849,7 +3870,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -3880,8 +3902,10 @@ See \`config.log' for more details." >&2;}
|
|||
esac
|
||||
else
|
||||
if test "$cross_compiling" = yes; then
|
||||
{ { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
|
||||
echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
|
||||
{ { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
|
||||
See \`config.log' for more details." >&5
|
||||
echo "$as_me: error: cannot run test program while cross compiling
|
||||
See \`config.log' for more details." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
else
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
|
|
@ -3993,7 +4017,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -4055,7 +4080,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -4095,7 +4121,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -4151,7 +4178,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -4191,7 +4219,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -4255,7 +4284,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -4286,8 +4316,10 @@ See \`config.log' for more details." >&2;}
|
|||
esac
|
||||
else
|
||||
if test "$cross_compiling" = yes; then
|
||||
{ { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
|
||||
echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
|
||||
{ { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
|
||||
See \`config.log' for more details." >&5
|
||||
echo "$as_me: error: cannot run test program while cross compiling
|
||||
See \`config.log' for more details." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
else
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
|
|
@ -4399,7 +4431,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -4461,7 +4494,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -4501,7 +4535,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -4557,7 +4592,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -4597,7 +4633,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -4661,7 +4698,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -4692,8 +4730,10 @@ See \`config.log' for more details." >&2;}
|
|||
esac
|
||||
else
|
||||
if test "$cross_compiling" = yes; then
|
||||
{ { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
|
||||
echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
|
||||
{ { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
|
||||
See \`config.log' for more details." >&5
|
||||
echo "$as_me: error: cannot run test program while cross compiling
|
||||
See \`config.log' for more details." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
else
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
|
|
@ -4805,7 +4845,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -4867,7 +4908,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -4907,7 +4949,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -4963,7 +5006,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -5003,7 +5047,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -5067,7 +5112,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -5098,8 +5144,10 @@ See \`config.log' for more details." >&2;}
|
|||
esac
|
||||
else
|
||||
if test "$cross_compiling" = yes; then
|
||||
{ { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
|
||||
echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
|
||||
{ { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
|
||||
See \`config.log' for more details." >&5
|
||||
echo "$as_me: error: cannot run test program while cross compiling
|
||||
See \`config.log' for more details." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
else
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
|
|
@ -5212,7 +5260,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -5274,7 +5323,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -5314,7 +5364,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -5370,7 +5421,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -5410,7 +5462,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -5474,7 +5527,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -5505,8 +5559,10 @@ See \`config.log' for more details." >&2;}
|
|||
esac
|
||||
else
|
||||
if test "$cross_compiling" = yes; then
|
||||
{ { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
|
||||
echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
|
||||
{ { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
|
||||
See \`config.log' for more details." >&5
|
||||
echo "$as_me: error: cannot run test program while cross compiling
|
||||
See \`config.log' for more details." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
else
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
|
|
@ -5620,7 +5676,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -5682,7 +5739,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -5722,7 +5780,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -5778,7 +5837,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -5818,7 +5878,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -5882,7 +5943,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -5913,8 +5975,10 @@ See \`config.log' for more details." >&2;}
|
|||
esac
|
||||
else
|
||||
if test "$cross_compiling" = yes; then
|
||||
{ { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
|
||||
echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
|
||||
{ { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
|
||||
See \`config.log' for more details." >&5
|
||||
echo "$as_me: error: cannot run test program while cross compiling
|
||||
See \`config.log' for more details." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
else
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
|
|
@ -6030,7 +6094,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -6080,7 +6145,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -6138,7 +6204,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -6356,7 +6423,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -7326,7 +7394,7 @@ if test "${gcc_cv_prog_makeinfo_modern+set}" = set; then
|
|||
else
|
||||
ac_prog_version=`$MAKEINFO --version 2>&1 |
|
||||
sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'`
|
||||
echo "configure:7329: version of makeinfo is $ac_prog_version" >&5
|
||||
echo "configure:7397: version of makeinfo is $ac_prog_version" >&5
|
||||
case $ac_prog_version in
|
||||
'') gcc_cv_prog_makeinfo_modern=no;;
|
||||
4.[2-9]*)
|
||||
|
|
@ -7581,7 +7649,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -7651,7 +7720,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -7816,7 +7886,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -7877,7 +7948,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -7947,7 +8019,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -8222,7 +8295,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -8295,7 +8369,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -8336,7 +8411,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -8538,7 +8614,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -8612,7 +8689,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -8666,7 +8744,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -8744,7 +8823,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -8798,7 +8878,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -8866,7 +8947,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -8996,7 +9078,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -9117,7 +9200,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -9468,7 +9552,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -9585,7 +9670,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -9697,7 +9783,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -9855,7 +9942,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -10727,7 +10815,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -10777,7 +10866,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -10867,7 +10957,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -10936,7 +11027,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -10999,7 +11091,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -11102,7 +11195,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -11187,7 +11281,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -11256,7 +11351,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -11331,7 +11427,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -11414,7 +11511,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -11490,7 +11588,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -11556,7 +11655,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -11692,7 +11792,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -12001,7 +12102,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -12267,7 +12369,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -12321,7 +12424,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
|||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -16249,6 +16353,11 @@ esac
|
|||
|
||||
|
||||
|
||||
if test x"$ac_file" != x-; then
|
||||
{ echo "$as_me:$LINENO: creating $ac_file" >&5
|
||||
echo "$as_me: creating $ac_file" >&6;}
|
||||
rm -f "$ac_file"
|
||||
fi
|
||||
# Let's still pretend it is `configure' which instantiates (i.e., don't
|
||||
# use $as_me), people would be surprised to read:
|
||||
# /* config.h. Generated by config.status. */
|
||||
|
|
@ -16287,12 +16396,6 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
|
|||
fi;;
|
||||
esac
|
||||
done` || { (exit 1); exit 1; }
|
||||
|
||||
if test x"$ac_file" != x-; then
|
||||
{ echo "$as_me:$LINENO: creating $ac_file" >&5
|
||||
echo "$as_me: creating $ac_file" >&6;}
|
||||
rm -f "$ac_file"
|
||||
fi
|
||||
_ACEOF
|
||||
cat >>$CONFIG_STATUS <<_ACEOF
|
||||
sed "$ac_vpsub
|
||||
|
|
|
|||
|
|
@ -1,3 +1,8 @@
|
|||
2005-02-28 Paolo Bonzini <bonzini@gnu.org>
|
||||
|
||||
PR bootstrap/17383
|
||||
* Makefile.in (GCC_DIR): Add $(HOST_SUBDIR) to the definition.
|
||||
|
||||
2004-12-03 Nathanael Nerode <neroden@gcc.gnu.org>
|
||||
|
||||
* Makefile.in: Add stamp file for building libada, to avoid
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ X_ADA_CFLAGS=@x_ada_cflags@
|
|||
ALL_ADA_CFLAGS=$(X_ADA_CFLAGS) $(T_ADA_CFLAGS) $(ADA_CFLAGS)
|
||||
|
||||
# For finding the GCC build dir, which is used far too much
|
||||
GCC_DIR=../../gcc
|
||||
GCC_DIR=../../$(HOST_SUBDIR)/gcc
|
||||
# Include fragment generated by GCC configure.
|
||||
include $(GCC_DIR)/libada-mk
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,15 @@
|
|||
2005-02-28 Paolo Bonzini <bonzini@gnu.org>
|
||||
|
||||
PR bootstrap/17383
|
||||
* configure.ac: Call GCC_TOPLEV_SUBDIRS.
|
||||
(COMPPATH): Removed.
|
||||
(ZIP, GCJH): Replace it with ../$(host_subdir).
|
||||
(built_gcc_dir): Add $(host_subdir).
|
||||
* configure: Regenerate.
|
||||
* Makefile.in, include/Makefile.in, testsuite/Makefile.in,
|
||||
gcj/Makefile.in, external/Makefile.in, external/sax/Makefile.in,
|
||||
external/w3c_dom/Makefile.in: Regenerate.
|
||||
|
||||
2005-02-24 David Gilbert <david.gilbert@object-refinery.com>
|
||||
|
||||
* java/awt/font/TextAttribute.java: changed names to lower case;
|
||||
|
|
|
|||
|
|
@ -4859,7 +4859,6 @@ CCDEPMODE = @CCDEPMODE@
|
|||
CFLAGS = @CFLAGS@
|
||||
CHECKREFSPEC = @CHECKREFSPEC@
|
||||
CLASSPATH_SEPARATOR = @CLASSPATH_SEPARATOR@
|
||||
COMPPATH = @COMPPATH@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CXX = @CXX@
|
||||
|
|
@ -5020,6 +5019,7 @@ build = @build@
|
|||
build_alias = @build_alias@
|
||||
build_cpu = @build_cpu@
|
||||
build_os = @build_os@
|
||||
build_subdir = @build_subdir@
|
||||
build_vendor = @build_vendor@
|
||||
datadir = @datadir@
|
||||
exec_prefix = @exec_prefix@
|
||||
|
|
@ -5032,6 +5032,7 @@ host = @host@
|
|||
host_alias = @host_alias@
|
||||
host_cpu = @host_cpu@
|
||||
host_os = @host_os@
|
||||
host_subdir = @host_subdir@
|
||||
host_vendor = @host_vendor@
|
||||
includedir = @includedir@
|
||||
infodir = @infodir@
|
||||
|
|
@ -5058,6 +5059,7 @@ target_cpu = @target_cpu@
|
|||
# autoconf2.13's target_alias
|
||||
target_noncanonical = @target_noncanonical@
|
||||
target_os = @target_os@
|
||||
target_subdir = @target_subdir@
|
||||
target_vendor = @target_vendor@
|
||||
tool_include_dir = @tool_include_dir@
|
||||
toolexecdir = @toolexecdir@
|
||||
|
|
@ -17156,6 +17158,8 @@ mostlyclean-compile:
|
|||
-rm -f gnu/java/nio/ChannelInputStream.lo
|
||||
-rm -f gnu/java/nio/ChannelOutputStream.$(OBJEXT)
|
||||
-rm -f gnu/java/nio/ChannelOutputStream.lo
|
||||
-rm -f gnu/java/nio/ChannelReader.$(OBJEXT)
|
||||
-rm -f gnu/java/nio/ChannelReader.lo
|
||||
-rm -f gnu/java/nio/DatagramChannelImpl.$(OBJEXT)
|
||||
-rm -f gnu/java/nio/DatagramChannelImpl.lo
|
||||
-rm -f gnu/java/nio/DatagramChannelSelectionKey.$(OBJEXT)
|
||||
|
|
|
|||
|
|
@ -310,7 +310,7 @@ ac_includes_default="\
|
|||
# include <unistd.h>
|
||||
#endif"
|
||||
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS libgcj_basedir build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S mkinstalldirs CC ac_ct_CC EXEEXT OBJEXT CXX ac_ct_CXX CFLAGS CXXFLAGS LDFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC INCLTDL LIBLTDL DIRLTDL LIBTOOL CXXCPP CPPFLAGS GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs COMPPATH TESTSUBDIR_TRUE TESTSUBDIR_FALSE ONESTEP_TRUE ONESTEP_FALSE LIBGCJDEBUG INTERPRETER LIBFFI LIBFFIINCS PLATFORM_INNER_NAT_HDRS CPP EGREP USING_WIN32_PLATFORM_TRUE USING_WIN32_PLATFORM_FALSE USING_POSIX_PLATFORM_TRUE USING_POSIX_PLATFORM_FALSE USING_ECOS_PLATFORM_TRUE USING_ECOS_PLATFORM_FALSE USING_DARWIN_CRT_TRUE USING_DARWIN_CRT_FALSE SYSTEMSPEC LIBGCJTESTSPEC ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE GTK_AWT_TRUE GTK_AWT_FALSE GTK_CAIRO_TRUE GTK_CAIRO_FALSE PKG_CONFIG CAIRO_CFLAGS CAIRO_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS GCLIBS GCINCS GCDEPS GCSPEC JC1GCSPEC GCTESTSPEC USING_BOEHMGC_TRUE USING_BOEHMGC_FALSE USING_NOGC_TRUE USING_NOGC_FALSE THREADLIBS THREADINCS THREADDEPS THREADSPEC THREADLDFLAGS THREADCXXFLAGS USING_POSIX_THREADS_TRUE USING_POSIX_THREADS_FALSE USING_WIN32_THREADS_TRUE USING_WIN32_THREADS_FALSE USING_NO_THREADS_TRUE USING_NO_THREADS_FALSE HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE gcc_version_trigger gcc_version_full gcc_version tool_include_dir LIBICONV LTLIBICONV GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS LIBART_CFLAGS LIBART_LIBS SUPPLY_BACKTRACE_TRUE SUPPLY_BACKTRACE_FALSE GCJH ZIP CLASSPATH_SEPARATOR ac_ct_GCJ ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir GCJVERSION gxx_include_dir libstdcxx_incdir ALLOCA PERL BACKTRACESPEC SYSDEP_SOURCES here LIBOBJS LTLIBOBJS'
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_subdir host_subdir target_subdir libgcj_basedir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S mkinstalldirs CC ac_ct_CC EXEEXT OBJEXT CXX ac_ct_CXX CFLAGS CXXFLAGS LDFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC INCLTDL LIBLTDL DIRLTDL LIBTOOL CXXCPP CPPFLAGS GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs TESTSUBDIR_TRUE TESTSUBDIR_FALSE ONESTEP_TRUE ONESTEP_FALSE LIBGCJDEBUG INTERPRETER LIBFFI LIBFFIINCS PLATFORM_INNER_NAT_HDRS CPP EGREP USING_WIN32_PLATFORM_TRUE USING_WIN32_PLATFORM_FALSE USING_POSIX_PLATFORM_TRUE USING_POSIX_PLATFORM_FALSE USING_ECOS_PLATFORM_TRUE USING_ECOS_PLATFORM_FALSE USING_DARWIN_CRT_TRUE USING_DARWIN_CRT_FALSE SYSTEMSPEC LIBGCJTESTSPEC ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE GTK_AWT_TRUE GTK_AWT_FALSE GTK_CAIRO_TRUE GTK_CAIRO_FALSE PKG_CONFIG CAIRO_CFLAGS CAIRO_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS GCLIBS GCINCS GCDEPS GCSPEC JC1GCSPEC GCTESTSPEC USING_BOEHMGC_TRUE USING_BOEHMGC_FALSE USING_NOGC_TRUE USING_NOGC_FALSE THREADLIBS THREADINCS THREADDEPS THREADSPEC THREADLDFLAGS THREADCXXFLAGS USING_POSIX_THREADS_TRUE USING_POSIX_THREADS_FALSE USING_WIN32_THREADS_TRUE USING_WIN32_THREADS_FALSE USING_NO_THREADS_TRUE USING_NO_THREADS_FALSE HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE gcc_version_trigger gcc_version_full gcc_version tool_include_dir LIBICONV LTLIBICONV GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS LIBART_CFLAGS LIBART_LIBS SUPPLY_BACKTRACE_TRUE SUPPLY_BACKTRACE_FALSE GCJH ZIP CLASSPATH_SEPARATOR ac_ct_GCJ ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir GCJVERSION gxx_include_dir libstdcxx_incdir ALLOCA PERL BACKTRACESPEC SYSDEP_SOURCES here LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
|
|
@ -1359,39 +1359,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
# We use these options to decide which functions to include.
|
||||
|
||||
# Check whether --with-target-subdir or --without-target-subdir was given.
|
||||
if test "${with_target_subdir+set}" = set; then
|
||||
withval="$with_target_subdir"
|
||||
|
||||
fi;
|
||||
|
||||
# We may get other options which we don't document:
|
||||
# --with-target-subdir, --with-multisrctop, --with-multisubdir
|
||||
|
||||
# When building with srcdir == objdir, links to the source files will
|
||||
# be created in directories within the target_subdir. We have to
|
||||
# adjust toplevel_srcdir accordingly, so that configure finds
|
||||
# install-sh and other auxiliary files that live in the top-level
|
||||
# source directory.
|
||||
if test "${srcdir}" = "."; then
|
||||
if test -z "${with_target_subdir}"; then
|
||||
toprel=".."
|
||||
else
|
||||
if test "${with_target_subdir}" != "."; then
|
||||
toprel="${with_multisrctop}../.."
|
||||
else
|
||||
toprel="${with_multisrctop}.."
|
||||
fi
|
||||
fi
|
||||
else
|
||||
toprel=".."
|
||||
fi
|
||||
|
||||
libgcj_basedir=$srcdir/$toprel/./libjava
|
||||
|
||||
|
||||
ac_aux_dir=
|
||||
|
|
@ -1451,6 +1418,67 @@ build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
|
|||
build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
||||
|
||||
|
||||
case ${build_alias} in
|
||||
"") build_noncanonical=${build} ;;
|
||||
*) build_noncanonical=${build_alias} ;;
|
||||
esac
|
||||
|
||||
case ${host_alias} in
|
||||
"") host_noncanonical=${build_noncanonical} ;;
|
||||
*) host_noncanonical=${host_alias} ;;
|
||||
esac
|
||||
|
||||
case ${target_alias} in
|
||||
"") target_noncanonical=${host_noncanonical} ;;
|
||||
*) target_noncanonical=${target_alias} ;;
|
||||
esac
|
||||
|
||||
# Prefix 'build-' so this never conflicts with target_subdir.
|
||||
build_subdir="build-${build_noncanonical}"
|
||||
# --srcdir=. covers the toplevel, while "test -d" covers the subdirectories
|
||||
if ( test $srcdir = . && test -d gcc ) \
|
||||
|| test -d $srcdir/../host-${host_noncanonical}; then
|
||||
host_subdir="host-${host_noncanonical}"
|
||||
else
|
||||
host_subdir=.
|
||||
fi
|
||||
# No prefix.
|
||||
target_subdir=${target_noncanonical}
|
||||
|
||||
|
||||
# We use these options to decide which functions to include.
|
||||
|
||||
# Check whether --with-target-subdir or --without-target-subdir was given.
|
||||
if test "${with_target_subdir+set}" = set; then
|
||||
withval="$with_target_subdir"
|
||||
|
||||
fi;
|
||||
|
||||
# We may get other options which we don't document:
|
||||
# --with-target-subdir, --with-multisrctop, --with-multisubdir
|
||||
|
||||
# When building with srcdir == objdir, links to the source files will
|
||||
# be created in directories within the target_subdir. We have to
|
||||
# adjust toplevel_srcdir accordingly, so that configure finds
|
||||
# install-sh and other auxiliary files that live in the top-level
|
||||
# source directory.
|
||||
if test "${srcdir}" = "."; then
|
||||
if test -z "${with_target_subdir}"; then
|
||||
toprel=".."
|
||||
else
|
||||
if test "${with_target_subdir}" != "."; then
|
||||
toprel="${with_multisrctop}../.."
|
||||
else
|
||||
toprel="${with_multisrctop}.."
|
||||
fi
|
||||
fi
|
||||
else
|
||||
toprel=".."
|
||||
fi
|
||||
|
||||
libgcj_basedir=$srcdir/$toprel/./libjava
|
||||
|
||||
|
||||
echo "$as_me:$LINENO: checking host system type" >&5
|
||||
echo $ECHO_N "checking host system type... $ECHO_C" >&6
|
||||
if test "${ac_cv_host+set}" = set; then
|
||||
|
|
@ -1506,11 +1534,6 @@ test -n "$target_alias" &&
|
|||
*) build_noncanonical=${build_alias} ;;
|
||||
esac
|
||||
|
||||
case ${host_alias} in
|
||||
"") host_noncanonical=${build_noncanonical} ;;
|
||||
*) host_noncanonical=${host_alias} ;;
|
||||
esac
|
||||
|
||||
case ${target_alias} in
|
||||
"") target_noncanonical=${host_noncanonical} ;;
|
||||
*) target_noncanonical=${target_alias} ;;
|
||||
|
|
@ -4743,7 +4766,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
|
|||
case $host in
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 4746 "configure"' > conftest.$ac_ext
|
||||
echo '#line 4769 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -5581,13 +5604,6 @@ fi
|
|||
subdirs="$subdirs libltdl"
|
||||
|
||||
|
||||
if test -z "$with_target_subdir" || test "$with_target_subdir" = "."; then
|
||||
COMPPATH=.
|
||||
else
|
||||
COMPPATH=..
|
||||
fi
|
||||
|
||||
|
||||
# The -no-testsuite modules omit the test subdir.
|
||||
|
||||
|
||||
|
|
@ -5774,7 +5790,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then
|
|||
:
|
||||
else
|
||||
cat > conftest.$ac_ext << EOF
|
||||
#line 5777 "configure"
|
||||
#line 5793 "configure"
|
||||
struct S { ~S(); };
|
||||
void bar();
|
||||
void foo()
|
||||
|
|
@ -13278,7 +13294,7 @@ NATIVE=yes
|
|||
|
||||
# Which gcj do we use?
|
||||
which_gcj=default
|
||||
built_gcc_dir="`cd ${builddotdot}/../../gcc && ${PWDCMD-pwd}`"
|
||||
built_gcc_dir="`cd ${builddotdot}/../../${host_subdir}/gcc && ${PWDCMD-pwd}`"
|
||||
if test -n "${with_cross_host}"; then
|
||||
# We are being configured with a cross compiler. We can't
|
||||
# use ac_exeext, because that is for the target platform.
|
||||
|
|
@ -13317,8 +13333,8 @@ fi
|
|||
case "${which_gcj}" in
|
||||
built)
|
||||
GCJ="$built_gcc_dir/gcj -B`${PWDCMD-pwd}`/ -B$built_gcc_dir/"
|
||||
GCJH='$(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh'
|
||||
ZIP='$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar'
|
||||
GCJH='$(MULTIBUILDTOP)../../$(host_subdir)/gcc/gcjh'
|
||||
ZIP='$(MULTIBUILDTOP)../../$(host_subdir)/fastjar/fastjar'
|
||||
;;
|
||||
cross)
|
||||
if test "x${with_newlib}" = "xyes"; then
|
||||
|
|
@ -16558,11 +16574,14 @@ s,@ECHO_C@,$ECHO_C,;t t
|
|||
s,@ECHO_N@,$ECHO_N,;t t
|
||||
s,@ECHO_T@,$ECHO_T,;t t
|
||||
s,@LIBS@,$LIBS,;t t
|
||||
s,@libgcj_basedir@,$libgcj_basedir,;t t
|
||||
s,@build@,$build,;t t
|
||||
s,@build_cpu@,$build_cpu,;t t
|
||||
s,@build_vendor@,$build_vendor,;t t
|
||||
s,@build_os@,$build_os,;t t
|
||||
s,@build_subdir@,$build_subdir,;t t
|
||||
s,@host_subdir@,$host_subdir,;t t
|
||||
s,@target_subdir@,$target_subdir,;t t
|
||||
s,@libgcj_basedir@,$libgcj_basedir,;t t
|
||||
s,@host@,$host,;t t
|
||||
s,@host_cpu@,$host_cpu,;t t
|
||||
s,@host_vendor@,$host_vendor,;t t
|
||||
|
|
@ -16642,7 +16661,6 @@ s,@GCJDEPMODE@,$GCJDEPMODE,;t t
|
|||
s,@am__fastdepGCJ_TRUE@,$am__fastdepGCJ_TRUE,;t t
|
||||
s,@am__fastdepGCJ_FALSE@,$am__fastdepGCJ_FALSE,;t t
|
||||
s,@subdirs@,$subdirs,;t t
|
||||
s,@COMPPATH@,$COMPPATH,;t t
|
||||
s,@TESTSUBDIR_TRUE@,$TESTSUBDIR_TRUE,;t t
|
||||
s,@TESTSUBDIR_FALSE@,$TESTSUBDIR_FALSE,;t t
|
||||
s,@ONESTEP_TRUE@,$ONESTEP_TRUE,;t t
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@ AC_INIT([libjava], [version-unused],, [libjava])
|
|||
|
||||
AC_CONFIG_SRCDIR(java/lang/System.java)
|
||||
|
||||
GCC_TOPLEV_SUBDIRS
|
||||
|
||||
# We use these options to decide which functions to include.
|
||||
AC_ARG_WITH(target-subdir,
|
||||
AS_HELP_STRING([--with-target-subdir=SUBDIR],
|
||||
|
|
@ -162,13 +164,6 @@ AM_PROG_GCJ
|
|||
AM_PROG_CC_C_O
|
||||
AC_CONFIG_SUBDIRS(libltdl)
|
||||
|
||||
if test -z "$with_target_subdir" || test "$with_target_subdir" = "."; then
|
||||
COMPPATH=.
|
||||
else
|
||||
COMPPATH=..
|
||||
fi
|
||||
AC_SUBST(COMPPATH)
|
||||
|
||||
# The -no-testsuite modules omit the test subdir.
|
||||
AM_CONDITIONAL(TESTSUBDIR, test -d $srcdir/testsuite)
|
||||
|
||||
|
|
@ -1039,7 +1034,7 @@ NATIVE=yes
|
|||
|
||||
# Which gcj do we use?
|
||||
which_gcj=default
|
||||
built_gcc_dir="`cd ${builddotdot}/../../gcc && ${PWDCMD-pwd}`"
|
||||
built_gcc_dir="`cd ${builddotdot}/../../${host_subdir}/gcc && ${PWDCMD-pwd}`"
|
||||
if test -n "${with_cross_host}"; then
|
||||
# We are being configured with a cross compiler. We can't
|
||||
# use ac_exeext, because that is for the target platform.
|
||||
|
|
@ -1078,8 +1073,8 @@ fi
|
|||
case "${which_gcj}" in
|
||||
built)
|
||||
GCJ="$built_gcc_dir/gcj -B`${PWDCMD-pwd}`/ -B$built_gcc_dir/"
|
||||
GCJH='$(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh'
|
||||
ZIP='$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar'
|
||||
GCJH='$(MULTIBUILDTOP)../../$(host_subdir)/gcc/gcjh'
|
||||
ZIP='$(MULTIBUILDTOP)../../$(host_subdir)/fastjar/fastjar'
|
||||
;;
|
||||
cross)
|
||||
if test "x${with_newlib}" = "xyes"; then
|
||||
|
|
|
|||
|
|
@ -87,7 +87,6 @@ CCDEPMODE = @CCDEPMODE@
|
|||
CFLAGS = @CFLAGS@
|
||||
CHECKREFSPEC = @CHECKREFSPEC@
|
||||
CLASSPATH_SEPARATOR = @CLASSPATH_SEPARATOR@
|
||||
COMPPATH = @COMPPATH@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CXX = @CXX@
|
||||
|
|
@ -248,6 +247,7 @@ build = @build@
|
|||
build_alias = @build_alias@
|
||||
build_cpu = @build_cpu@
|
||||
build_os = @build_os@
|
||||
build_subdir = @build_subdir@
|
||||
build_vendor = @build_vendor@
|
||||
datadir = @datadir@
|
||||
exec_prefix = @exec_prefix@
|
||||
|
|
@ -260,6 +260,7 @@ host = @host@
|
|||
host_alias = @host_alias@
|
||||
host_cpu = @host_cpu@
|
||||
host_os = @host_os@
|
||||
host_subdir = @host_subdir@
|
||||
host_vendor = @host_vendor@
|
||||
includedir = @includedir@
|
||||
infodir = @infodir@
|
||||
|
|
@ -284,6 +285,7 @@ target_alias = @target_alias@
|
|||
target_cpu = @target_cpu@
|
||||
target_noncanonical = @target_noncanonical@
|
||||
target_os = @target_os@
|
||||
target_subdir = @target_subdir@
|
||||
target_vendor = @target_vendor@
|
||||
tool_include_dir = @tool_include_dir@
|
||||
toolexecdir = @toolexecdir@
|
||||
|
|
|
|||
|
|
@ -124,7 +124,6 @@ CCDEPMODE = @CCDEPMODE@
|
|||
CFLAGS = @CFLAGS@
|
||||
CHECKREFSPEC = @CHECKREFSPEC@
|
||||
CLASSPATH_SEPARATOR = @CLASSPATH_SEPARATOR@
|
||||
COMPPATH = @COMPPATH@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CXX = @CXX@
|
||||
|
|
@ -285,6 +284,7 @@ build = @build@
|
|||
build_alias = @build_alias@
|
||||
build_cpu = @build_cpu@
|
||||
build_os = @build_os@
|
||||
build_subdir = @build_subdir@
|
||||
build_vendor = @build_vendor@
|
||||
datadir = @datadir@
|
||||
exec_prefix = @exec_prefix@
|
||||
|
|
@ -297,6 +297,7 @@ host = @host@
|
|||
host_alias = @host_alias@
|
||||
host_cpu = @host_cpu@
|
||||
host_os = @host_os@
|
||||
host_subdir = @host_subdir@
|
||||
host_vendor = @host_vendor@
|
||||
includedir = @includedir@
|
||||
infodir = @infodir@
|
||||
|
|
@ -321,6 +322,7 @@ target_alias = @target_alias@
|
|||
target_cpu = @target_cpu@
|
||||
target_noncanonical = @target_noncanonical@
|
||||
target_os = @target_os@
|
||||
target_subdir = @target_subdir@
|
||||
target_vendor = @target_vendor@
|
||||
tool_include_dir = @tool_include_dir@
|
||||
toolexecdir = @toolexecdir@
|
||||
|
|
|
|||
|
|
@ -218,7 +218,6 @@ CCDEPMODE = @CCDEPMODE@
|
|||
CFLAGS = @CFLAGS@
|
||||
CHECKREFSPEC = @CHECKREFSPEC@
|
||||
CLASSPATH_SEPARATOR = @CLASSPATH_SEPARATOR@
|
||||
COMPPATH = @COMPPATH@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CXX = @CXX@
|
||||
|
|
@ -379,6 +378,7 @@ build = @build@
|
|||
build_alias = @build_alias@
|
||||
build_cpu = @build_cpu@
|
||||
build_os = @build_os@
|
||||
build_subdir = @build_subdir@
|
||||
build_vendor = @build_vendor@
|
||||
datadir = @datadir@
|
||||
exec_prefix = @exec_prefix@
|
||||
|
|
@ -391,6 +391,7 @@ host = @host@
|
|||
host_alias = @host_alias@
|
||||
host_cpu = @host_cpu@
|
||||
host_os = @host_os@
|
||||
host_subdir = @host_subdir@
|
||||
host_vendor = @host_vendor@
|
||||
includedir = @includedir@
|
||||
infodir = @infodir@
|
||||
|
|
@ -415,6 +416,7 @@ target_alias = @target_alias@
|
|||
target_cpu = @target_cpu@
|
||||
target_noncanonical = @target_noncanonical@
|
||||
target_os = @target_os@
|
||||
target_subdir = @target_subdir@
|
||||
target_vendor = @target_vendor@
|
||||
tool_include_dir = @tool_include_dir@
|
||||
toolexecdir = @toolexecdir@
|
||||
|
|
|
|||
|
|
@ -92,7 +92,6 @@ CCDEPMODE = @CCDEPMODE@
|
|||
CFLAGS = @CFLAGS@
|
||||
CHECKREFSPEC = @CHECKREFSPEC@
|
||||
CLASSPATH_SEPARATOR = @CLASSPATH_SEPARATOR@
|
||||
COMPPATH = @COMPPATH@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CXX = @CXX@
|
||||
|
|
@ -253,6 +252,7 @@ build = @build@
|
|||
build_alias = @build_alias@
|
||||
build_cpu = @build_cpu@
|
||||
build_os = @build_os@
|
||||
build_subdir = @build_subdir@
|
||||
build_vendor = @build_vendor@
|
||||
datadir = @datadir@
|
||||
exec_prefix = @exec_prefix@
|
||||
|
|
@ -265,6 +265,7 @@ host = @host@
|
|||
host_alias = @host_alias@
|
||||
host_cpu = @host_cpu@
|
||||
host_os = @host_os@
|
||||
host_subdir = @host_subdir@
|
||||
host_vendor = @host_vendor@
|
||||
includedir = @includedir@
|
||||
infodir = @infodir@
|
||||
|
|
@ -291,6 +292,7 @@ target_cpu = @target_cpu@
|
|||
# autoconf2.13's target_alias
|
||||
target_noncanonical = @target_noncanonical@
|
||||
target_os = @target_os@
|
||||
target_subdir = @target_subdir@
|
||||
target_vendor = @target_vendor@
|
||||
tool_include_dir = @tool_include_dir@
|
||||
toolexecdir = @toolexecdir@
|
||||
|
|
|
|||
|
|
@ -91,7 +91,6 @@ CCDEPMODE = @CCDEPMODE@
|
|||
CFLAGS = @CFLAGS@
|
||||
CHECKREFSPEC = @CHECKREFSPEC@
|
||||
CLASSPATH_SEPARATOR = @CLASSPATH_SEPARATOR@
|
||||
COMPPATH = @COMPPATH@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CXX = @CXX@
|
||||
|
|
@ -252,6 +251,7 @@ build = @build@
|
|||
build_alias = @build_alias@
|
||||
build_cpu = @build_cpu@
|
||||
build_os = @build_os@
|
||||
build_subdir = @build_subdir@
|
||||
build_vendor = @build_vendor@
|
||||
datadir = @datadir@
|
||||
exec_prefix = @exec_prefix@
|
||||
|
|
@ -264,6 +264,7 @@ host = @host@
|
|||
host_alias = @host_alias@
|
||||
host_cpu = @host_cpu@
|
||||
host_os = @host_os@
|
||||
host_subdir = @host_subdir@
|
||||
host_vendor = @host_vendor@
|
||||
includedir = @includedir@
|
||||
infodir = @infodir@
|
||||
|
|
@ -290,6 +291,7 @@ target_cpu = @target_cpu@
|
|||
# autoconf2.13's target_alias
|
||||
target_noncanonical = @target_noncanonical@
|
||||
target_os = @target_os@
|
||||
target_subdir = @target_subdir@
|
||||
target_vendor = @target_vendor@
|
||||
tool_include_dir = @tool_include_dir@
|
||||
toolexecdir = @toolexecdir@
|
||||
|
|
|
|||
|
|
@ -80,7 +80,6 @@ CCDEPMODE = @CCDEPMODE@
|
|||
CFLAGS = @CFLAGS@
|
||||
CHECKREFSPEC = @CHECKREFSPEC@
|
||||
CLASSPATH_SEPARATOR = @CLASSPATH_SEPARATOR@
|
||||
COMPPATH = @COMPPATH@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CXX = @CXX@
|
||||
|
|
@ -241,6 +240,7 @@ build = @build@
|
|||
build_alias = @build_alias@
|
||||
build_cpu = @build_cpu@
|
||||
build_os = @build_os@
|
||||
build_subdir = @build_subdir@
|
||||
build_vendor = @build_vendor@
|
||||
datadir = @datadir@
|
||||
exec_prefix = @exec_prefix@
|
||||
|
|
@ -253,6 +253,7 @@ host = @host@
|
|||
host_alias = @host_alias@
|
||||
host_cpu = @host_cpu@
|
||||
host_os = @host_os@
|
||||
host_subdir = @host_subdir@
|
||||
host_vendor = @host_vendor@
|
||||
includedir = @includedir@
|
||||
infodir = @infodir@
|
||||
|
|
@ -279,6 +280,7 @@ target_cpu = @target_cpu@
|
|||
# autoconf2.13's target_alias
|
||||
target_noncanonical = @target_noncanonical@
|
||||
target_os = @target_os@
|
||||
target_subdir = @target_subdir@
|
||||
target_vendor = @target_vendor@
|
||||
tool_include_dir = @tool_include_dir@
|
||||
toolexecdir = @toolexecdir@
|
||||
|
|
|
|||
|
|
@ -1,3 +1,12 @@
|
|||
2005-02-28 Paolo Bonzini <bonzini@gnu.org>
|
||||
|
||||
PR bootstrap/17383
|
||||
* configure.ac: Call GCC_TOPLEV_SUBDIRS.
|
||||
(Determine CFLAGS for gthread): Use $host_subdir.
|
||||
* configure: Regenerate.
|
||||
* Makefile.in (host_subdir): New.
|
||||
(INCLUDES): Use it.
|
||||
|
||||
2004-12-20 Andrew Pinski <pinskia@physics.uc.edu>
|
||||
|
||||
PR libobjc/12035
|
||||
|
|
|
|||
|
|
@ -34,6 +34,7 @@ prefix = @prefix@
|
|||
exec_prefix = @exec_prefix@
|
||||
target_noncanonical = @target_noncanonical@
|
||||
gcc_version = @gcc_version@
|
||||
host_subdir = @host_subdir@
|
||||
top_srcdir = @top_srcdir@
|
||||
toplevel_srcdir = @toplevel_srcdir@
|
||||
toolexecdir = @toolexecdir@
|
||||
|
|
@ -90,7 +91,8 @@ LIBTOOL_CLEAN = $(LIBTOOL) --mode=clean
|
|||
#LIBTOOL_UNINSTALL = $(LIBTOOL) --mode=uninstall
|
||||
|
||||
INCLUDES = -I$(srcdir)/objc -I$(srcdir)/$(MULTISRCTOP)../gcc \
|
||||
-I$(srcdir)/$(MULTISRCTOP)../gcc/config -I$(MULTIBUILDTOP)../../gcc \
|
||||
-I$(srcdir)/$(MULTISRCTOP)../gcc/config \
|
||||
-I$(MULTIBUILDTOP)../../$(host_subdir)/gcc \
|
||||
-I$(srcdir)/$(MULTISRCTOP)../include
|
||||
|
||||
OBJC_GCFLAGS=-DOBJC_WITH_GC=1
|
||||
|
|
|
|||
|
|
@ -309,7 +309,7 @@ ac_includes_default="\
|
|||
# include <unistd.h>
|
||||
#endif"
|
||||
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION OBJC_BOEHM_GC toplevel_srcdir build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical glibcpp_srcdir gcc_version_trigger gcc_version_full gcc_version toolexecdir toolexeclibdir includedirname libext CC ac_ct_CC EXEEXT OBJEXT CFLAGS AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LN_S STRIP ac_ct_STRIP LIBTOOL SET_MAKE CPP CPPFLAGS EGREP GTHREAD_FLAGS LIBOBJS LTLIBOBJS'
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_subdir host_subdir target_subdir VERSION OBJC_BOEHM_GC toplevel_srcdir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical glibcpp_srcdir gcc_version_trigger gcc_version_full gcc_version toolexecdir toolexeclibdir includedirname libext CC ac_ct_CC EXEEXT OBJEXT CFLAGS AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LN_S STRIP ac_ct_STRIP LIBTOOL SET_MAKE CPP CPPFLAGS EGREP GTHREAD_FLAGS LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
|
|
@ -1314,6 +1314,90 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|||
|
||||
|
||||
|
||||
|
||||
ac_aux_dir=
|
||||
for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
|
||||
if test -f $ac_dir/install-sh; then
|
||||
ac_aux_dir=$ac_dir
|
||||
ac_install_sh="$ac_aux_dir/install-sh -c"
|
||||
break
|
||||
elif test -f $ac_dir/install.sh; then
|
||||
ac_aux_dir=$ac_dir
|
||||
ac_install_sh="$ac_aux_dir/install.sh -c"
|
||||
break
|
||||
elif test -f $ac_dir/shtool; then
|
||||
ac_aux_dir=$ac_dir
|
||||
ac_install_sh="$ac_aux_dir/shtool install -c"
|
||||
break
|
||||
fi
|
||||
done
|
||||
if test -z "$ac_aux_dir"; then
|
||||
{ { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
|
||||
echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
ac_config_guess="$SHELL $ac_aux_dir/config.guess"
|
||||
ac_config_sub="$SHELL $ac_aux_dir/config.sub"
|
||||
ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
|
||||
|
||||
# Make sure we can run config.sub.
|
||||
$ac_config_sub sun4 >/dev/null 2>&1 ||
|
||||
{ { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
|
||||
echo "$as_me: error: cannot run $ac_config_sub" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
|
||||
echo "$as_me:$LINENO: checking build system type" >&5
|
||||
echo $ECHO_N "checking build system type... $ECHO_C" >&6
|
||||
if test "${ac_cv_build+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
ac_cv_build_alias=$build_alias
|
||||
test -z "$ac_cv_build_alias" &&
|
||||
ac_cv_build_alias=`$ac_config_guess`
|
||||
test -z "$ac_cv_build_alias" &&
|
||||
{ { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
|
||||
echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
|
||||
{ { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
|
||||
echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $ac_cv_build" >&5
|
||||
echo "${ECHO_T}$ac_cv_build" >&6
|
||||
build=$ac_cv_build
|
||||
build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
|
||||
build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
|
||||
build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
||||
|
||||
|
||||
case ${build_alias} in
|
||||
"") build_noncanonical=${build} ;;
|
||||
*) build_noncanonical=${build_alias} ;;
|
||||
esac
|
||||
|
||||
case ${host_alias} in
|
||||
"") host_noncanonical=${build_noncanonical} ;;
|
||||
*) host_noncanonical=${host_alias} ;;
|
||||
esac
|
||||
|
||||
case ${target_alias} in
|
||||
"") target_noncanonical=${host_noncanonical} ;;
|
||||
*) target_noncanonical=${target_alias} ;;
|
||||
esac
|
||||
|
||||
# Prefix 'build-' so this never conflicts with target_subdir.
|
||||
build_subdir="build-${build_noncanonical}"
|
||||
# --srcdir=. covers the toplevel, while "test -d" covers the subdirectories
|
||||
if ( test $srcdir = . && test -d gcc ) \
|
||||
|| test -d $srcdir/../host-${host_noncanonical}; then
|
||||
host_subdir="host-${host_noncanonical}"
|
||||
else
|
||||
host_subdir=.
|
||||
fi
|
||||
# No prefix.
|
||||
target_subdir=${target_noncanonical}
|
||||
|
||||
|
||||
# We need the following definitions because AC_PROG_LIBTOOL relies on them
|
||||
|
|
@ -1441,38 +1525,6 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
|
|||
toplevel_srcdir=\${srcdir}/$toprel
|
||||
|
||||
|
||||
# Make sure we can run config.sub.
|
||||
$ac_config_sub sun4 >/dev/null 2>&1 ||
|
||||
{ { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
|
||||
echo "$as_me: error: cannot run $ac_config_sub" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
|
||||
echo "$as_me:$LINENO: checking build system type" >&5
|
||||
echo $ECHO_N "checking build system type... $ECHO_C" >&6
|
||||
if test "${ac_cv_build+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
ac_cv_build_alias=$build_alias
|
||||
test -z "$ac_cv_build_alias" &&
|
||||
ac_cv_build_alias=`$ac_config_guess`
|
||||
test -z "$ac_cv_build_alias" &&
|
||||
{ { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
|
||||
echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
|
||||
{ { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
|
||||
echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $ac_cv_build" >&5
|
||||
echo "${ECHO_T}$ac_cv_build" >&6
|
||||
build=$ac_cv_build
|
||||
build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
|
||||
build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
|
||||
build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
||||
|
||||
|
||||
echo "$as_me:$LINENO: checking host system type" >&5
|
||||
echo $ECHO_N "checking host system type... $ECHO_C" >&6
|
||||
if test "${ac_cv_host+set}" = set; then
|
||||
|
|
@ -1523,21 +1575,6 @@ test -n "$target_alias" &&
|
|||
test "$program_prefix$program_suffix$program_transform_name" = \
|
||||
NONENONEs,x,x, &&
|
||||
program_prefix=${target_alias}-
|
||||
case ${build_alias} in
|
||||
"") build_noncanonical=${build} ;;
|
||||
*) build_noncanonical=${build_alias} ;;
|
||||
esac
|
||||
|
||||
case ${host_alias} in
|
||||
"") host_noncanonical=${build_noncanonical} ;;
|
||||
*) host_noncanonical=${host_alias} ;;
|
||||
esac
|
||||
|
||||
case ${target_alias} in
|
||||
"") target_noncanonical=${host_noncanonical} ;;
|
||||
*) target_noncanonical=${target_alias} ;;
|
||||
esac
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -3675,7 +3712,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
|
|||
case $host in
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 3678 "configure"' > conftest.$ac_ext
|
||||
echo '#line 3715 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -5075,16 +5112,16 @@ done
|
|||
# -----------
|
||||
|
||||
# Determine CFLAGS for gthread.
|
||||
# FIXME: the current implementation is dependent on the 'r' variable
|
||||
# passed down from the top level
|
||||
echo "$as_me:$LINENO: checking for gthread cflags" >&5
|
||||
echo $ECHO_N "checking for gthread cflags... $ECHO_C" >&6
|
||||
if test "${objc_cv_gthread_flags+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
if test -f "$r"/gcc/Makefile
|
||||
# we know we are compiled as a target library, so the toplevel build directory
|
||||
# is ../..
|
||||
if test -f ../../$host_subdir/gcc/Makefile
|
||||
then
|
||||
objc_cv_gthread_flags=`grep \^GTHREAD_FLAGS "$r"/gcc/Makefile | awk -F= '{ print $2 }'`
|
||||
objc_cv_gthread_flags=`grep \^GTHREAD_FLAGS ../../$host_subdir/gcc/Makefile | awk -F= '{ print $2 }'`
|
||||
else
|
||||
{ { echo "$as_me:$LINENO: error: not found" >&5
|
||||
echo "$as_me: error: not found" >&2;}
|
||||
|
|
@ -5110,7 +5147,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then
|
|||
:
|
||||
else
|
||||
cat > conftest.$ac_ext << EOF
|
||||
#line 5113 "configure"
|
||||
#line 5150 "configure"
|
||||
@interface Frob
|
||||
@end
|
||||
@implementation Frob
|
||||
|
|
@ -5814,13 +5851,16 @@ s,@ECHO_C@,$ECHO_C,;t t
|
|||
s,@ECHO_N@,$ECHO_N,;t t
|
||||
s,@ECHO_T@,$ECHO_T,;t t
|
||||
s,@LIBS@,$LIBS,;t t
|
||||
s,@VERSION@,$VERSION,;t t
|
||||
s,@OBJC_BOEHM_GC@,$OBJC_BOEHM_GC,;t t
|
||||
s,@toplevel_srcdir@,$toplevel_srcdir,;t t
|
||||
s,@build@,$build,;t t
|
||||
s,@build_cpu@,$build_cpu,;t t
|
||||
s,@build_vendor@,$build_vendor,;t t
|
||||
s,@build_os@,$build_os,;t t
|
||||
s,@build_subdir@,$build_subdir,;t t
|
||||
s,@host_subdir@,$host_subdir,;t t
|
||||
s,@target_subdir@,$target_subdir,;t t
|
||||
s,@VERSION@,$VERSION,;t t
|
||||
s,@OBJC_BOEHM_GC@,$OBJC_BOEHM_GC,;t t
|
||||
s,@toplevel_srcdir@,$toplevel_srcdir,;t t
|
||||
s,@host@,$host,;t t
|
||||
s,@host_cpu@,$host_cpu,;t t
|
||||
s,@host_vendor@,$host_vendor,;t t
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
AC_PREREQ(2.59)
|
||||
AC_INIT(package-unused, version-unused,, libobjc)
|
||||
AC_CONFIG_SRCDIR([objc/objc.h])
|
||||
GCC_TOPLEV_SUBDIRS
|
||||
|
||||
# We need the following definitions because AC_PROG_LIBTOOL relies on them
|
||||
PACKAGE=libobjc
|
||||
|
|
@ -218,12 +219,12 @@ AC_CHECK_HEADERS(sched.h)
|
|||
# -----------
|
||||
|
||||
# Determine CFLAGS for gthread.
|
||||
# FIXME: the current implementation is dependent on the 'r' variable
|
||||
# passed down from the top level
|
||||
AC_CACHE_CHECK([for gthread cflags],objc_cv_gthread_flags,
|
||||
[if test -f "$r"/gcc/Makefile
|
||||
[# we know we are compiled as a target library, so the toplevel build directory
|
||||
# is ../..
|
||||
if test -f ../../$host_subdir/gcc/Makefile
|
||||
then
|
||||
objc_cv_gthread_flags=`grep \^GTHREAD_FLAGS "$r"/gcc/Makefile | awk -F= '{ print $2 }'`
|
||||
objc_cv_gthread_flags=`grep \^GTHREAD_FLAGS ../../$host_subdir/gcc/Makefile | awk -F= '{ print $2 }'`
|
||||
else
|
||||
AC_MSG_ERROR([not found])
|
||||
fi])
|
||||
|
|
|
|||
Loading…
Reference in New Issue