X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=Makefile.def;h=3d2c6eeeb44b3e6444959a00c1330088fcd47fde;hb=3adf154903ffac329c3ec83b06e34b0332d9e5cf;hp=1d792aefd64795b8a44b602bd6cdbb525246e35f;hpb=4f0ef2d88b484966e5203cb6258aa1195be49688;p=deliverable%2Fbinutils-gdb.git diff --git a/Makefile.def b/Makefile.def index 1d792aefd6..3d2c6eeeb4 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; }; @@ -52,18 +51,23 @@ host_modules= { module= fileutils; }; host_modules= { module= findutils; }; host_modules= { module= find; }; host_modules= { module= fixincludes; - missing= info; - missing= dvi; - missing= TAGS; - missing= install-info; - missing= installcheck; }; + missing= TAGS; }; 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; }; @@ -118,6 +122,7 @@ target_modules = { module= libstdc++-v3; lib_path=.libs; raw_cxx=true; }; target_modules = { module= libmudflap; lib_path=.libs; }; target_modules = { module= libssp; lib_path=.libs; }; target_modules = { module= newlib; }; +target_modules = { module= libgcc; bootstrap=true; no_check=true; }; target_modules = { module= libgfortran; }; target_modules = { module= libobjc; }; target_modules = { module= libtermcap; no_check=true; @@ -147,6 +152,8 @@ recursive_targets = { make_target= info; depend=configure; }; recursive_targets = { make_target= dvi; depend=configure; }; +recursive_targets = { make_target= pdf; + depend=configure; }; recursive_targets = { make_target= html; depend=configure; }; recursive_targets = { make_target= TAGS; @@ -154,6 +161,9 @@ recursive_targets = { make_target= TAGS; recursive_targets = { make_target= install-info; depend=configure; depend=info; }; +recursive_targets = { make_target= install-pdf; + depend=configure; + depend=pdf; }; recursive_targets = { make_target= install-html; depend=configure; depend=html; }; @@ -177,6 +187,7 @@ flags_to_pass = { flag= includedir ; }; flags_to_pass = { flag= datarootdir ; }; flags_to_pass = { flag= docdir ; }; flags_to_pass = { flag= infodir ; }; +flags_to_pass = { flag= pdfdir ; }; flags_to_pass = { flag= htmldir ; }; flags_to_pass = { flag= libdir ; }; flags_to_pass = { flag= libexecdir ; }; @@ -223,7 +234,10 @@ flags_to_pass = { flag= LDFLAGS ; }; flags_to_pass = { flag= LIBCFLAGS ; }; flags_to_pass = { flag= LIBCXXFLAGS ; }; flags_to_pass = { flag= STAGE1_CFLAGS ; }; +flags_to_pass = { flag= STAGE1_CHECKING ; }; flags_to_pass = { flag= STAGE1_LANGUAGES ; }; +flags_to_pass = { flag= GNATBIND ; }; +flags_to_pass = { flag= GNATMAKE ; }; // Target tools flags_to_pass = { flag= AR_FOR_TARGET ; }; @@ -270,7 +284,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; }; @@ -293,13 +309,15 @@ 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; }; +dependencies = { module=configure-gdb; on=all-bfd; }; dependencies = { module=all-gdb; on=all-intl; }; dependencies = { module=all-gdb; on=all-libiberty; }; dependencies = { module=all-gdb; on=all-opcodes; }; -dependencies = { module=all-gdb; on=all-bfd; }; dependencies = { module=all-gdb; on=all-readline; }; dependencies = { module=all-gdb; on=all-build-bison; }; dependencies = { module=all-gdb; on=all-build-byacc; }; @@ -353,8 +371,10 @@ dependencies = { module=all-ld; on=all-build-byacc; }; dependencies = { module=all-ld; on=all-build-flex; }; dependencies = { module=all-ld; on=all-intl; }; +dependencies = { module=configure-opcodes; on=configure-intl; }; dependencies = { module=all-opcodes; on=all-bfd; }; dependencies = { module=all-opcodes; on=all-libiberty; }; +dependencies = { module=all-opcodes; on=all-intl; }; // Other host modules in the 'src' repository. dependencies = { module=all-dejagnu; on=all-tcl; }; @@ -433,18 +453,17 @@ dependencies = { module=all-tar; on=all-build-texinfo; }; dependencies = { module=all-uudecode; on=all-build-texinfo; }; // Target modules. These can also have dependencies on the language -// environment (e.g. on libstdc++). -lang_env_dependencies = { module=boehm-gc; }; +// environment (e.g. on libstdc++). By default target modules depend +// on libgcc and newlib/libgloss. lang_env_dependencies = { module=gperf; cxx=true; }; -lang_env_dependencies = { module=libada; }; -lang_env_dependencies = { module=libgfortran; }; -lang_env_dependencies = { module=libffi; }; lang_env_dependencies = { module=libjava; cxx=true; }; -lang_env_dependencies = { module=libmudflap; }; -lang_env_dependencies = { module=libobjc; }; -lang_env_dependencies = { module=libssp; }; -lang_env_dependencies = { module=libstdc++-v3; }; -lang_env_dependencies = { module=zlib; }; +lang_env_dependencies = { module=newlib; no_c=true; }; +lang_env_dependencies = { module=libgloss; no_c=true; }; +lang_env_dependencies = { module=libgcc; no_gcc=true; no_c=true; }; +// libiberty does not depend on newlib or libgloss because it must be +// built newlib on some targets (e.g. Cygwin). It still needs +// a dependency on libgcc for native targets to configure. +lang_env_dependencies = { module=libiberty; no_c=true; }; dependencies = { module=configure-target-boehm-gc; on=configure-target-qthreads; }; dependencies = { module=configure-target-fastjar; on=configure-target-zlib; }; @@ -478,33 +497,40 @@ dependencies = { module=all-target-winsup; on=all-target-libtermcap; }; // Toplevel bootstrap bootstrap_stage = { id=1 ; - stage_configure_flags='--disable-intermodule \ + + // * We force-disable intermodule optimizations, even if + // --enable-intermodule was passed, since the installed compiler + // probably can't handle them. Luckily, autoconf always respects + // the last argument when conflicting --enable arguments are passed. + // * Likewise, we force-disable coverage flags, since the installed + // compiler probably has never heard of them. + stage_configure_flags='--disable-intermodule $(STAGE1_CHECKING) \ --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"' ; - stage_make_flags='CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"' ; }; + stage_cflags='$(STAGE1_CFLAGS)' ; }; bootstrap_stage = { id=2 ; prev=1 ; bootstrap_target=bootstrap2 ; stage_configure_flags="@stage2_werror_flag@" ; - stage_make_flags="" ; }; + stage_cflags="$(BOOT_CFLAGS)" ; }; bootstrap_stage = { id=3 ; prev=2 ; lean=1 ; compare_target=compare ; bootstrap_target=bootstrap ; cleanstrap_target=cleanstrap ; stage_configure_flags="@stage2_werror_flag@" ; - stage_make_flags="" ; }; + stage_cflags="$(BOOT_CFLAGS)" ; }; bootstrap_stage = { id=4 ; prev=3 ; lean=2 ; compare_target=compare3 ; bootstrap_target=bootstrap4 ; stage_configure_flags="@stage2_werror_flag@" ; - stage_make_flags="" ; }; + stage_cflags="$(BOOT_CFLAGS)" ; }; bootstrap_stage = { id=profile ; prev=1 ; stage_configure_flags="@stage2_werror_flag@" ; - stage_make_flags='CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"' ; }; + stage_cflags='$(BOOT_CFLAGS) -fprofile-generate' ; }; bootstrap_stage = { id=feedback ; prev=profile ; bootstrap_target=profiledbootstrap ; stage_configure_flags="@stage2_werror_flag@" ; - stage_make_flags='CFLAGS="$(BOOT_CFLAGS) -fprofile-use"' ; }; + stage_cflags='$(BOOT_CFLAGS) -fprofile-use' ; };