From df145479b9205174260519419ad72e97d4239de7 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Thu, 11 Jan 2007 11:22:52 +0000 Subject: 2007-01-11 Paolo Bonzini Nick Clifton Kaveh R. Ghazi * configure.in (build_configargs, host_configargs, target_configargs): Remove build/host/target parameters. (host_libs): Add gmp and mpfr. (GMP tests): Reorganize to allow in-tree GMP/MPFR. * Makefile.def (gmp, mpfr): New. (gcc): Remove target. * Makefile.tpl (build_os, build_vendor, host_os, host_vendor, target_os, target_vendor): New. (configure): Add host_alias/target_alias arguments. Adjust invocations. * configure: Regenerate. * Makefile.in: Regenerate. 2007-01-11 Matt Fago * configure.in: Try to link to functions only in mpfr 2.2.x to improve robustness of configure tests. * configure: Regenerate. --- Makefile.def | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'Makefile.def') diff --git a/Makefile.def b/Makefile.def index c7a67e64d2..da5394fd07 100644 --- a/Makefile.def +++ b/Makefile.def @@ -30,8 +30,7 @@ build_modules= { module= byacc; }; build_modules= { module= flex; }; build_modules= { module= m4; }; build_modules= { module= texinfo; }; -build_modules= { module= fixincludes; - extra_configure_args='--target=$(target)'; }; +build_modules= { module= fixincludes; }; host_modules= { module= ash; }; host_modules= { module= autoconf; }; @@ -61,10 +60,19 @@ host_modules= { module= fixincludes; host_modules= { module= flex; no_check_cross= true; }; host_modules= { module= gas; bootstrap=true; }; host_modules= { module= gcc; bootstrap=true; - target="`if [ -f stage_last ]; then echo quickstrap ; else echo all; fi`"; extra_make_flags="$(EXTRA_GCC_FLAGS)"; }; host_modules= { module= gawk; }; host_modules= { module= gettext; }; +host_modules= { module= gmp; lib_path=.libs; bootstrap=true; + extra_configure_flags='--disable-shared'; + no_install= true; + host="none-${host_vendor}-${host_os}"; + target="none-${host_vendor}-${host_os}"; }; +host_modules= { module= mpfr; lib_path=.libs; bootstrap=true; + extra_configure_flags='--disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp'; + no_install= true; + host="none-${host_vendor}-${host_os}"; + target="none-${host_vendor}-${host_os}"; }; host_modules= { module= gnuserv; }; host_modules= { module= gprof; }; host_modules= { module= gzip; }; @@ -275,7 +283,9 @@ dependencies = { module=configure-gcc; on=all-binutils; }; dependencies = { module=configure-gcc; on=all-gas; }; dependencies = { module=configure-gcc; on=all-ld; }; dependencies = { module=all-gcc; on=all-libiberty; hard=true; }; +dependencies = { module=all-gcc; on=all-gmp; }; dependencies = { module=all-gcc; on=all-intl; }; +dependencies = { module=all-gcc; on=all-mpfr; }; dependencies = { module=all-gcc; on=all-build-texinfo; }; dependencies = { module=all-gcc; on=all-build-bison; }; dependencies = { module=all-gcc; on=all-build-byacc; }; @@ -298,6 +308,8 @@ dependencies = { module=all-fixincludes; on=all-libiberty; }; dependencies = { module=all-gnattools; on=all-target-libada; }; +dependencies = { module=configure-mpfr; on=all-gmp; }; + // Host modules specific to gdb. dependencies = { module=configure-gdb; on=configure-intl; }; dependencies = { module=configure-gdb; on=configure-sim; }; -- cgit v1.2.1