re PR bootstrap/39739 (Bootstrapping with in-tree mpfr-2.4.1 and --with-gmp=... errors)
PR bootstrap/39739 * configure.ac (extra_mpfr_configure_flags): Set and AC_SUBST. * Makefile.def (module=mpfr): Use extra_mpfr_configure_flags. * configure, Makefile.in: Regenerate. From-SVN: r146758
This commit is contained in:
parent
e0412213c4
commit
fce81a8402
|
@ -1,3 +1,11 @@
|
||||||
|
2009-04-25 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
|
||||||
|
|
||||||
|
PR bootstrap/39739
|
||||||
|
* configure.ac (extra_mpfr_configure_flags): Set and AC_SUBST.
|
||||||
|
* Makefile.def (module=mpfr): Use extra_mpfr_configure_flags.
|
||||||
|
|
||||||
|
* configure, Makefile.in: Regenerate.
|
||||||
|
|
||||||
2009-02-05 Andreas Schwab <schwab@suse.de>
|
2009-02-05 Andreas Schwab <schwab@suse.de>
|
||||||
|
|
||||||
* Makefile.tpl (stage_last): Define $r and $s before using
|
* Makefile.tpl (stage_last): Define $r and $s before using
|
||||||
|
|
|
@ -64,7 +64,7 @@ host_modules= { module= gmp; lib_path=.libs; bootstrap=true;
|
||||||
host="none-${host_vendor}-${host_os}";
|
host="none-${host_vendor}-${host_os}";
|
||||||
target="none-${host_vendor}-${host_os}"; };
|
target="none-${host_vendor}-${host_os}"; };
|
||||||
host_modules= { module= mpfr; lib_path=.libs; bootstrap=true;
|
host_modules= { module= mpfr; lib_path=.libs; bootstrap=true;
|
||||||
extra_configure_flags='--disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp';
|
extra_configure_flags='--disable-shared @extra_mpfr_configure_flags@';
|
||||||
no_install= true;
|
no_install= true;
|
||||||
host="none-${host_vendor}-${host_os}";
|
host="none-${host_vendor}-${host_os}";
|
||||||
target="none-${host_vendor}-${host_os}"; };
|
target="none-${host_vendor}-${host_os}"; };
|
||||||
|
|
18
Makefile.in
18
Makefile.in
|
@ -16772,7 +16772,7 @@ configure-mpfr:
|
||||||
libsrcdir="$$s/mpfr"; \
|
libsrcdir="$$s/mpfr"; \
|
||||||
$(SHELL) $${libsrcdir}/configure \
|
$(SHELL) $${libsrcdir}/configure \
|
||||||
$(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
|
$(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
|
||||||
--target=none-${host_vendor}-${host_os} $${srcdiroption} --disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp \
|
--target=none-${host_vendor}-${host_os} $${srcdiroption} --disable-shared @extra_mpfr_configure_flags@ \
|
||||||
|| exit 1
|
|| exit 1
|
||||||
@endif mpfr
|
@endif mpfr
|
||||||
|
|
||||||
|
@ -16805,7 +16805,7 @@ configure-stage1-mpfr:
|
||||||
$(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
|
$(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
|
||||||
--target=none-${host_vendor}-${host_os} $${srcdiroption} \
|
--target=none-${host_vendor}-${host_os} $${srcdiroption} \
|
||||||
\
|
\
|
||||||
--disable-intermodule $(STAGE1_CHECKING) --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" --disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp
|
--disable-intermodule $(STAGE1_CHECKING) --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" --disable-shared @extra_mpfr_configure_flags@
|
||||||
@endif mpfr-bootstrap
|
@endif mpfr-bootstrap
|
||||||
|
|
||||||
.PHONY: configure-stage2-mpfr maybe-configure-stage2-mpfr
|
.PHONY: configure-stage2-mpfr maybe-configure-stage2-mpfr
|
||||||
|
@ -16836,7 +16836,7 @@ configure-stage2-mpfr:
|
||||||
$(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
|
$(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
|
||||||
--target=none-${host_vendor}-${host_os} $${srcdiroption} \
|
--target=none-${host_vendor}-${host_os} $${srcdiroption} \
|
||||||
--with-build-libsubdir=$(HOST_SUBDIR) \
|
--with-build-libsubdir=$(HOST_SUBDIR) \
|
||||||
@stage2_werror_flag@ --disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp
|
@stage2_werror_flag@ --disable-shared @extra_mpfr_configure_flags@
|
||||||
@endif mpfr-bootstrap
|
@endif mpfr-bootstrap
|
||||||
|
|
||||||
.PHONY: configure-stageb2g0-mpfr maybe-configure-stageb2g0-mpfr
|
.PHONY: configure-stageb2g0-mpfr maybe-configure-stageb2g0-mpfr
|
||||||
|
@ -16867,7 +16867,7 @@ configure-stageb2g0-mpfr:
|
||||||
$(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
|
$(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
|
||||||
--target=none-${host_vendor}-${host_os} $${srcdiroption} \
|
--target=none-${host_vendor}-${host_os} $${srcdiroption} \
|
||||||
--with-build-libsubdir=$(HOST_SUBDIR) \
|
--with-build-libsubdir=$(HOST_SUBDIR) \
|
||||||
@stage2_werror_flag@ --disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp
|
@stage2_werror_flag@ --disable-shared @extra_mpfr_configure_flags@
|
||||||
@endif mpfr-bootstrap
|
@endif mpfr-bootstrap
|
||||||
|
|
||||||
.PHONY: configure-stage3-mpfr maybe-configure-stage3-mpfr
|
.PHONY: configure-stage3-mpfr maybe-configure-stage3-mpfr
|
||||||
|
@ -16898,7 +16898,7 @@ configure-stage3-mpfr:
|
||||||
$(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
|
$(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
|
||||||
--target=none-${host_vendor}-${host_os} $${srcdiroption} \
|
--target=none-${host_vendor}-${host_os} $${srcdiroption} \
|
||||||
--with-build-libsubdir=$(HOST_SUBDIR) \
|
--with-build-libsubdir=$(HOST_SUBDIR) \
|
||||||
@stage2_werror_flag@ --disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp
|
@stage2_werror_flag@ --disable-shared @extra_mpfr_configure_flags@
|
||||||
@endif mpfr-bootstrap
|
@endif mpfr-bootstrap
|
||||||
|
|
||||||
.PHONY: configure-stageb3g2-mpfr maybe-configure-stageb3g2-mpfr
|
.PHONY: configure-stageb3g2-mpfr maybe-configure-stageb3g2-mpfr
|
||||||
|
@ -16929,7 +16929,7 @@ configure-stageb3g2-mpfr:
|
||||||
$(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
|
$(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
|
||||||
--target=none-${host_vendor}-${host_os} $${srcdiroption} \
|
--target=none-${host_vendor}-${host_os} $${srcdiroption} \
|
||||||
--with-build-libsubdir=$(HOST_SUBDIR) \
|
--with-build-libsubdir=$(HOST_SUBDIR) \
|
||||||
@stage2_werror_flag@ --disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp
|
@stage2_werror_flag@ --disable-shared @extra_mpfr_configure_flags@
|
||||||
@endif mpfr-bootstrap
|
@endif mpfr-bootstrap
|
||||||
|
|
||||||
.PHONY: configure-stage4-mpfr maybe-configure-stage4-mpfr
|
.PHONY: configure-stage4-mpfr maybe-configure-stage4-mpfr
|
||||||
|
@ -16960,7 +16960,7 @@ configure-stage4-mpfr:
|
||||||
$(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
|
$(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
|
||||||
--target=none-${host_vendor}-${host_os} $${srcdiroption} \
|
--target=none-${host_vendor}-${host_os} $${srcdiroption} \
|
||||||
--with-build-libsubdir=$(HOST_SUBDIR) \
|
--with-build-libsubdir=$(HOST_SUBDIR) \
|
||||||
@stage2_werror_flag@ --disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp
|
@stage2_werror_flag@ --disable-shared @extra_mpfr_configure_flags@
|
||||||
@endif mpfr-bootstrap
|
@endif mpfr-bootstrap
|
||||||
|
|
||||||
.PHONY: configure-stageprofile-mpfr maybe-configure-stageprofile-mpfr
|
.PHONY: configure-stageprofile-mpfr maybe-configure-stageprofile-mpfr
|
||||||
|
@ -16991,7 +16991,7 @@ configure-stageprofile-mpfr:
|
||||||
$(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
|
$(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
|
||||||
--target=none-${host_vendor}-${host_os} $${srcdiroption} \
|
--target=none-${host_vendor}-${host_os} $${srcdiroption} \
|
||||||
--with-build-libsubdir=$(HOST_SUBDIR) \
|
--with-build-libsubdir=$(HOST_SUBDIR) \
|
||||||
@stage2_werror_flag@ --disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp
|
@stage2_werror_flag@ --disable-shared @extra_mpfr_configure_flags@
|
||||||
@endif mpfr-bootstrap
|
@endif mpfr-bootstrap
|
||||||
|
|
||||||
.PHONY: configure-stagefeedback-mpfr maybe-configure-stagefeedback-mpfr
|
.PHONY: configure-stagefeedback-mpfr maybe-configure-stagefeedback-mpfr
|
||||||
|
@ -17022,7 +17022,7 @@ configure-stagefeedback-mpfr:
|
||||||
$(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
|
$(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
|
||||||
--target=none-${host_vendor}-${host_os} $${srcdiroption} \
|
--target=none-${host_vendor}-${host_os} $${srcdiroption} \
|
||||||
--with-build-libsubdir=$(HOST_SUBDIR) \
|
--with-build-libsubdir=$(HOST_SUBDIR) \
|
||||||
@stage2_werror_flag@ --disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp
|
@stage2_werror_flag@ --disable-shared @extra_mpfr_configure_flags@
|
||||||
@endif mpfr-bootstrap
|
@endif mpfr-bootstrap
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -272,7 +272,7 @@ PACKAGE_STRING=
|
||||||
PACKAGE_BUGREPORT=
|
PACKAGE_BUGREPORT=
|
||||||
|
|
||||||
ac_unique_file="move-if-change"
|
ac_unique_file="move-if-change"
|
||||||
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_noncanonical host_noncanonical target_noncanonical host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN LN_S TOPLEVEL_CONFIGURE_ARGUMENTS build_libsubdir build_subdir host_subdir target_subdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GNATBIND ac_ct_GNATBIND GNATMAKE ac_ct_GNATMAKE do_compare gmplibs gmpinc stage1_languages SYSROOT_CFLAGS_FOR_TARGET DEBUG_PREFIX_CFLAGS_FOR_TARGET RPATH_ENVVAR tooldir build_tooldir CONFIGURE_GDB_TK GDB_TK INSTALL_GDB_TK build_configargs build_configdirs host_configargs configdirs target_configargs AR_FOR_BUILD AS_FOR_BUILD CC_FOR_BUILD CFLAGS_FOR_BUILD CXXFLAGS_FOR_BUILD CXX_FOR_BUILD DLLTOOL_FOR_BUILD GCJ_FOR_BUILD GFORTRAN_FOR_BUILD LDFLAGS_FOR_BUILD LD_FOR_BUILD NM_FOR_BUILD RANLIB_FOR_BUILD WINDMC_FOR_BUILD WINDRES_FOR_BUILD config_shell YACC BISON M4 LEX FLEX MAKEINFO EXPECT RUNTEST AR AS DLLTOOL LD LIPO NM RANLIB STRIP WINDRES WINDMC OBJCOPY OBJDUMP CC_FOR_TARGET CXX_FOR_TARGET GCC_FOR_TARGET GCJ_FOR_TARGET GFORTRAN_FOR_TARGET AR_FOR_TARGET AS_FOR_TARGET DLLTOOL_FOR_TARGET LD_FOR_TARGET LIPO_FOR_TARGET NM_FOR_TARGET OBJDUMP_FOR_TARGET RANLIB_FOR_TARGET STRIP_FOR_TARGET WINDRES_FOR_TARGET WINDMC_FOR_TARGET RAW_CXX_FOR_TARGET FLAGS_FOR_TARGET COMPILER_AS_FOR_TARGET COMPILER_LD_FOR_TARGET COMPILER_NM_FOR_TARGET MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT stage1_cflags stage1_checking stage2_werror_flag datarootdir docdir pdfdir htmldir 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_noncanonical host_noncanonical target_noncanonical host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN LN_S TOPLEVEL_CONFIGURE_ARGUMENTS build_libsubdir build_subdir host_subdir target_subdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GNATBIND ac_ct_GNATBIND GNATMAKE ac_ct_GNATMAKE do_compare gmplibs gmpinc extra_mpfr_configure_flags stage1_languages SYSROOT_CFLAGS_FOR_TARGET DEBUG_PREFIX_CFLAGS_FOR_TARGET RPATH_ENVVAR tooldir build_tooldir CONFIGURE_GDB_TK GDB_TK INSTALL_GDB_TK build_configargs build_configdirs host_configargs configdirs target_configargs AR_FOR_BUILD AS_FOR_BUILD CC_FOR_BUILD CFLAGS_FOR_BUILD CXXFLAGS_FOR_BUILD CXX_FOR_BUILD DLLTOOL_FOR_BUILD GCJ_FOR_BUILD GFORTRAN_FOR_BUILD LDFLAGS_FOR_BUILD LD_FOR_BUILD NM_FOR_BUILD RANLIB_FOR_BUILD WINDMC_FOR_BUILD WINDRES_FOR_BUILD config_shell YACC BISON M4 LEX FLEX MAKEINFO EXPECT RUNTEST AR AS DLLTOOL LD LIPO NM RANLIB STRIP WINDRES WINDMC OBJCOPY OBJDUMP CC_FOR_TARGET CXX_FOR_TARGET GCC_FOR_TARGET GCJ_FOR_TARGET GFORTRAN_FOR_TARGET AR_FOR_TARGET AS_FOR_TARGET DLLTOOL_FOR_TARGET LD_FOR_TARGET LIPO_FOR_TARGET NM_FOR_TARGET OBJDUMP_FOR_TARGET RANLIB_FOR_TARGET STRIP_FOR_TARGET WINDRES_FOR_TARGET WINDMC_FOR_TARGET RAW_CXX_FOR_TARGET FLAGS_FOR_TARGET COMPILER_AS_FOR_TARGET COMPILER_LD_FOR_TARGET COMPILER_NM_FOR_TARGET MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT stage1_cflags stage1_checking stage2_werror_flag datarootdir docdir pdfdir htmldir LIBOBJS LTLIBOBJS'
|
||||||
ac_subst_files='serialization_dependencies host_makefile_frag target_makefile_frag alphaieee_frag ospace_frag'
|
ac_subst_files='serialization_dependencies host_makefile_frag target_makefile_frag alphaieee_frag ospace_frag'
|
||||||
|
|
||||||
# Initialize some variables set by options.
|
# Initialize some variables set by options.
|
||||||
|
@ -4469,6 +4469,7 @@ fi
|
||||||
if test "x$with_gmp$with_gmp_include$with_gmp_lib" = x && test -d ${srcdir}/gmp; then
|
if test "x$with_gmp$with_gmp_include$with_gmp_lib" = x && test -d ${srcdir}/gmp; then
|
||||||
gmplibs='-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/gmp/_libs '"$gmplibs"
|
gmplibs='-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/gmp/_libs '"$gmplibs"
|
||||||
gmpinc='-I$$r/$(HOST_SUBDIR)/gmp -I$$s/gmp '"$gmpinc"
|
gmpinc='-I$$r/$(HOST_SUBDIR)/gmp -I$$s/gmp '"$gmpinc"
|
||||||
|
extra_mpfr_configure_flags='--with-gmp-build=$$r/$(HOST_SUBDIR)/gmp'
|
||||||
# Do not test the gmp version. Assume that it is sufficient, since
|
# Do not test the gmp version. Assume that it is sufficient, since
|
||||||
# it is in the source tree, and the library has not been built yet
|
# it is in the source tree, and the library has not been built yet
|
||||||
# but it would be included on the link line in the version check below
|
# but it would be included on the link line in the version check below
|
||||||
|
@ -4683,6 +4684,7 @@ fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# By default, C is the only stage 1 language.
|
# By default, C is the only stage 1 language.
|
||||||
stage1_languages=,c,
|
stage1_languages=,c,
|
||||||
|
|
||||||
|
@ -12822,6 +12824,7 @@ s,@ac_ct_GNATMAKE@,$ac_ct_GNATMAKE,;t t
|
||||||
s,@do_compare@,$do_compare,;t t
|
s,@do_compare@,$do_compare,;t t
|
||||||
s,@gmplibs@,$gmplibs,;t t
|
s,@gmplibs@,$gmplibs,;t t
|
||||||
s,@gmpinc@,$gmpinc,;t t
|
s,@gmpinc@,$gmpinc,;t t
|
||||||
|
s,@extra_mpfr_configure_flags@,$extra_mpfr_configure_flags,;t t
|
||||||
s,@stage1_languages@,$stage1_languages,;t t
|
s,@stage1_languages@,$stage1_languages,;t t
|
||||||
s,@SYSROOT_CFLAGS_FOR_TARGET@,$SYSROOT_CFLAGS_FOR_TARGET,;t t
|
s,@SYSROOT_CFLAGS_FOR_TARGET@,$SYSROOT_CFLAGS_FOR_TARGET,;t t
|
||||||
s,@DEBUG_PREFIX_CFLAGS_FOR_TARGET@,$DEBUG_PREFIX_CFLAGS_FOR_TARGET,;t t
|
s,@DEBUG_PREFIX_CFLAGS_FOR_TARGET@,$DEBUG_PREFIX_CFLAGS_FOR_TARGET,;t t
|
||||||
|
|
|
@ -1201,6 +1201,7 @@ fi
|
||||||
if test "x$with_gmp$with_gmp_include$with_gmp_lib" = x && test -d ${srcdir}/gmp; then
|
if test "x$with_gmp$with_gmp_include$with_gmp_lib" = x && test -d ${srcdir}/gmp; then
|
||||||
gmplibs='-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/gmp/_libs '"$gmplibs"
|
gmplibs='-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/gmp/_libs '"$gmplibs"
|
||||||
gmpinc='-I$$r/$(HOST_SUBDIR)/gmp -I$$s/gmp '"$gmpinc"
|
gmpinc='-I$$r/$(HOST_SUBDIR)/gmp -I$$s/gmp '"$gmpinc"
|
||||||
|
extra_mpfr_configure_flags='--with-gmp-build=$$r/$(HOST_SUBDIR)/gmp'
|
||||||
# Do not test the gmp version. Assume that it is sufficient, since
|
# Do not test the gmp version. Assume that it is sufficient, since
|
||||||
# it is in the source tree, and the library has not been built yet
|
# it is in the source tree, and the library has not been built yet
|
||||||
# but it would be included on the link line in the version check below
|
# but it would be included on the link line in the version check below
|
||||||
|
@ -1265,6 +1266,7 @@ fi
|
||||||
# Flags needed for both GMP and/or MPFR
|
# Flags needed for both GMP and/or MPFR
|
||||||
AC_SUBST(gmplibs)
|
AC_SUBST(gmplibs)
|
||||||
AC_SUBST(gmpinc)
|
AC_SUBST(gmpinc)
|
||||||
|
AC_SUBST(extra_mpfr_configure_flags)
|
||||||
|
|
||||||
# By default, C is the only stage 1 language.
|
# By default, C is the only stage 1 language.
|
||||||
stage1_languages=,c,
|
stage1_languages=,c,
|
||||||
|
|
Loading…
Reference in New Issue