Skip to content

R
riscv-gcc-1
Commit 0ff2d841 by Richard Guenther Committed by Richard Biener
Options

configure.ac (extra_isl_gmp_configure_flags): Initialize and subst. 

2012-07-06  Richard Guenther  <rguenther@suse.de>

	* configure.ac (extra_isl_gmp_configure_flags): Initialize and subst.
	* Makefile.def (isl): Use extra_isl_gmp_configure_flags and
	supply V=1 as extra_make_flags.
	* configure: Regenerated.
	* Makefile.in: Likewise.

From-SVN: r189327
parent 2b9d5ad7
Showing with 53 additions and 35 deletions
ChangeLog
2012-07-06 Richard Guenther <rguenther@suse.de>
* configure.ac (extra_isl_gmp_configure_flags): Initialize and subst.
* Makefile.def (isl): Use extra_isl_gmp_configure_flags and
supply V=1 as extra_make_flags.
* configure: Regenerated.
* Makefile.in: Likewise.
2012-07-04 Tristan Gingold <gingold@adacore.com> 2012-07-04 Tristan Gingold <gingold@adacore.com>
* configure: Regenerate. * configure: Regenerate.
......
Makefile.def
...@@ -62,7 +62,8 @@ host_modules= { module= mpc; lib_path=.libs; bootstrap=true; ...@@ -62,7 +62,8 @@ host_modules= { module= mpc; lib_path=.libs; bootstrap=true;
extra_configure_flags='--disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@'; extra_configure_flags='--disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@';
no_install= true; }; no_install= true; };
host_modules= { module= isl; lib_path=.libs; bootstrap=true; host_modules= { module= isl; lib_path=.libs; bootstrap=true;
extra_configure_flags='--disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp'; extra_configure_flags='--disable-shared @extra_isl_gmp_configure_flags@';
extra_make_flags='V=1';
no_install= true; }; no_install= true; };
host_modules= { module= cloog; lib_path=.libs; bootstrap=true; host_modules= { module= cloog; lib_path=.libs; bootstrap=true;
extra_configure_flags='--disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp --with-isl=system'; extra_configure_flags='--disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp --with-isl=system';
......
configure
...@@ -646,12 +646,14 @@ stage1_languages ...@@ -646,12 +646,14 @@ stage1_languages
extra_host_libiberty_configure_flags extra_host_libiberty_configure_flags
clooginc clooginc
clooglibs clooglibs
extra_cloog_isl_configure_flags
islinc islinc
isllibs isllibs
poststage1_ldflags poststage1_ldflags
poststage1_libs poststage1_libs
stage1_libs stage1_libs
stage1_ldflags stage1_ldflags
extra_isl_gmp_configure_flags
extra_mpc_mpfr_configure_flags extra_mpc_mpfr_configure_flags
extra_mpc_gmp_configure_flags extra_mpc_gmp_configure_flags
extra_mpfr_configure_flags extra_mpfr_configure_flags
...@@ -5303,6 +5305,7 @@ if test "x$with_gmp$with_gmp_include$with_gmp_lib" = x && test -d ${srcdir}/gmp; ...@@ -5303,6 +5305,7 @@ if test "x$with_gmp$with_gmp_include$with_gmp_lib" = x && test -d ${srcdir}/gmp;
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-include=$$r/$(HOST_SUBDIR)/gmp --with-gmp-lib=$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir" extra_mpfr_configure_flags='--with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-gmp-lib=$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir"
extra_mpc_gmp_configure_flags='--with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-gmp-lib=$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir" extra_mpc_gmp_configure_flags='--with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-gmp-lib=$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir"
extra_isl_gmp_configure_flags='--with-gmp-builddir=$$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
...@@ -5542,6 +5545,7 @@ fi ...@@ -5542,6 +5545,7 @@ fi
# Allow host libstdc++ to be specified for static linking with PPL. # Allow host libstdc++ to be specified for static linking with PPL.
# Check whether --with-host-libstdcxx was given. # Check whether --with-host-libstdcxx was given.
...@@ -5671,10 +5675,12 @@ fi ...@@ -5671,10 +5675,12 @@ fi
if test "x${with_isl_lib}" != x; then if test "x${with_isl_lib}" != x; then
isllibs="-L$with_isl_lib" isllibs="-L$with_isl_lib"
fi fi
extra_cloog_isl_configure_flags='--with-isl=system'
if test "x${islinc}" = x && test "x${isllibs}" = x \ if test "x${islinc}" = x && test "x${isllibs}" = x \
&& test -d ${srcdir}/isl; then && test -d ${srcdir}/isl; then
isllibs='-L$$r/$(HOST_SUBDIR)/isl/'"$lt_cv_objdir"' ' isllibs='-L$$r/$(HOST_SUBDIR)/isl/'"$lt_cv_objdir"' '
islinc='-I$$r/$(HOST_SUBDIR)/isl/include -I$$s/isl/include' islinc='-I$$r/$(HOST_SUBDIR)/isl/include -I$$s/isl/include'
extra_cloog_isl_configure_flags='--with-isl-builddir=$$r/$(HOST_DIR)/isl'
ENABLE_ISL_CHECK=no ENABLE_ISL_CHECK=no
fi fi
...@@ -5684,6 +5690,7 @@ fi ...@@ -5684,6 +5690,7 @@ fi
if test "x$with_isl" != "xno"; then if test "x$with_isl" != "xno"; then
if test "${ENABLE_ISL_CHECK}" = yes ; then if test "${ENABLE_ISL_CHECK}" = yes ; then
......
configure.ac
...@@ -1341,6 +1341,7 @@ if test "x$with_gmp$with_gmp_include$with_gmp_lib" = x && test -d ${srcdir}/gmp; ...@@ -1341,6 +1341,7 @@ if test "x$with_gmp$with_gmp_include$with_gmp_lib" = x && test -d ${srcdir}/gmp;
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-include=$$r/$(HOST_SUBDIR)/gmp --with-gmp-lib=$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir" extra_mpfr_configure_flags='--with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-gmp-lib=$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir"
extra_mpc_gmp_configure_flags='--with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-gmp-lib=$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir" extra_mpc_gmp_configure_flags='--with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-gmp-lib=$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir"
extra_isl_gmp_configure_flags='--with-gmp-builddir=$$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
...@@ -1453,6 +1454,7 @@ AC_SUBST(gmpinc) ...@@ -1453,6 +1454,7 @@ AC_SUBST(gmpinc)
AC_SUBST(extra_mpfr_configure_flags) AC_SUBST(extra_mpfr_configure_flags)
AC_SUBST(extra_mpc_gmp_configure_flags) AC_SUBST(extra_mpc_gmp_configure_flags)
AC_SUBST(extra_mpc_mpfr_configure_flags) AC_SUBST(extra_mpc_mpfr_configure_flags)
AC_SUBST(extra_isl_gmp_configure_flags)
# Allow host libstdc++ to be specified for static linking with PPL. # Allow host libstdc++ to be specified for static linking with PPL.
AC_ARG_WITH(host-libstdcxx, AC_ARG_WITH(host-libstdcxx,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment