summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog8
-rw-r--r--Makefile.def3
-rw-r--r--Makefile.in68
-rwxr-xr-xconfigure7
-rw-r--r--configure.ac2
5 files changed, 53 insertions, 35 deletions
diff --git a/ChangeLog b/ChangeLog
index b0ec2914446..bfa2b7e0f6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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>
* configure: Regenerate.
diff --git a/Makefile.def b/Makefile.def
index cd13ed0d0bd..4be9af890e6 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -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@';
no_install= 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; };
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';
diff --git a/Makefile.in b/Makefile.in
index a9b8a0ec3a2..2b6fcebdeb5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -13041,7 +13041,7 @@ configure-isl:
libsrcdir="$$s/isl"; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp \
+ --target=${target_alias} $${srcdiroption} --disable-shared @extra_isl_gmp_configure_flags@ \
|| exit 1
@endif isl
@@ -13076,7 +13076,7 @@ configure-stage1-isl:
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
--target=${target_alias} $${srcdiroption} \
$(STAGE1_CONFIGURE_FLAGS) \
- --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp
+ --disable-shared @extra_isl_gmp_configure_flags@
@endif isl-bootstrap
.PHONY: configure-stage2-isl maybe-configure-stage2-isl
@@ -13110,7 +13110,7 @@ configure-stage2-isl:
--target=${target_alias} $${srcdiroption} \
--with-build-libsubdir=$(HOST_SUBDIR) \
$(STAGE2_CONFIGURE_FLAGS) \
- --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp
+ --disable-shared @extra_isl_gmp_configure_flags@
@endif isl-bootstrap
.PHONY: configure-stage3-isl maybe-configure-stage3-isl
@@ -13144,7 +13144,7 @@ configure-stage3-isl:
--target=${target_alias} $${srcdiroption} \
--with-build-libsubdir=$(HOST_SUBDIR) \
$(STAGE3_CONFIGURE_FLAGS) \
- --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp
+ --disable-shared @extra_isl_gmp_configure_flags@
@endif isl-bootstrap
.PHONY: configure-stage4-isl maybe-configure-stage4-isl
@@ -13178,7 +13178,7 @@ configure-stage4-isl:
--target=${target_alias} $${srcdiroption} \
--with-build-libsubdir=$(HOST_SUBDIR) \
$(STAGE4_CONFIGURE_FLAGS) \
- --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp
+ --disable-shared @extra_isl_gmp_configure_flags@
@endif isl-bootstrap
.PHONY: configure-stageprofile-isl maybe-configure-stageprofile-isl
@@ -13212,7 +13212,7 @@ configure-stageprofile-isl:
--target=${target_alias} $${srcdiroption} \
--with-build-libsubdir=$(HOST_SUBDIR) \
$(STAGEprofile_CONFIGURE_FLAGS) \
- --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp
+ --disable-shared @extra_isl_gmp_configure_flags@
@endif isl-bootstrap
.PHONY: configure-stagefeedback-isl maybe-configure-stagefeedback-isl
@@ -13246,7 +13246,7 @@ configure-stagefeedback-isl:
--target=${target_alias} $${srcdiroption} \
--with-build-libsubdir=$(HOST_SUBDIR) \
$(STAGEfeedback_CONFIGURE_FLAGS) \
- --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp
+ --disable-shared @extra_isl_gmp_configure_flags@
@endif isl-bootstrap
@@ -13266,7 +13266,7 @@ all-isl: configure-isl
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/isl && \
- $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) V=1 \
$(TARGET-isl))
@endif isl
@@ -13294,7 +13294,7 @@ all-stage1-isl: configure-stage1-isl
CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
- $(EXTRA_HOST_FLAGS) \
+ $(EXTRA_HOST_FLAGS) V=1 \
TFLAGS="$(STAGE1_TFLAGS)" \
$(TARGET-stage1-isl)
@@ -13309,7 +13309,7 @@ clean-stage1-isl:
fi; \
cd $(HOST_SUBDIR)/isl && \
$(MAKE) $(EXTRA_HOST_FLAGS) \
- clean
+ V=1 clean
@endif isl-bootstrap
@@ -13336,7 +13336,7 @@ all-stage2-isl: configure-stage2-isl
CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
- $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
+ $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) V=1 \
TFLAGS="$(STAGE2_TFLAGS)" \
$(TARGET-stage2-isl)
@@ -13352,7 +13352,7 @@ clean-stage2-isl:
cd $(HOST_SUBDIR)/isl && \
$(MAKE) $(EXTRA_HOST_FLAGS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- clean
+ V=1 clean
@endif isl-bootstrap
@@ -13379,7 +13379,7 @@ all-stage3-isl: configure-stage3-isl
CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
- $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
+ $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) V=1 \
TFLAGS="$(STAGE3_TFLAGS)" \
$(TARGET-stage3-isl)
@@ -13395,7 +13395,7 @@ clean-stage3-isl:
cd $(HOST_SUBDIR)/isl && \
$(MAKE) $(EXTRA_HOST_FLAGS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- clean
+ V=1 clean
@endif isl-bootstrap
@@ -13422,7 +13422,7 @@ all-stage4-isl: configure-stage4-isl
CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
- $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
+ $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) V=1 \
TFLAGS="$(STAGE4_TFLAGS)" \
$(TARGET-stage4-isl)
@@ -13438,7 +13438,7 @@ clean-stage4-isl:
cd $(HOST_SUBDIR)/isl && \
$(MAKE) $(EXTRA_HOST_FLAGS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- clean
+ V=1 clean
@endif isl-bootstrap
@@ -13465,7 +13465,7 @@ all-stageprofile-isl: configure-stageprofile-isl
CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
- $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
+ $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) V=1 \
TFLAGS="$(STAGEprofile_TFLAGS)" \
$(TARGET-stageprofile-isl)
@@ -13481,7 +13481,7 @@ clean-stageprofile-isl:
cd $(HOST_SUBDIR)/isl && \
$(MAKE) $(EXTRA_HOST_FLAGS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- clean
+ V=1 clean
@endif isl-bootstrap
@@ -13508,7 +13508,7 @@ all-stagefeedback-isl: configure-stagefeedback-isl
CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
- $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
+ $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) V=1 \
TFLAGS="$(STAGEfeedback_TFLAGS)" \
$(TARGET-stagefeedback-isl)
@@ -13524,7 +13524,7 @@ clean-stagefeedback-isl:
cd $(HOST_SUBDIR)/isl && \
$(MAKE) $(EXTRA_HOST_FLAGS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- clean
+ V=1 clean
@endif isl-bootstrap
@@ -13542,7 +13542,7 @@ check-isl:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/isl && \
- $(MAKE) $(FLAGS_TO_PASS) check)
+ $(MAKE) $(FLAGS_TO_PASS) V=1 check)
@endif isl
@@ -13577,7 +13577,7 @@ info-isl: \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
- for flag in $(EXTRA_HOST_FLAGS) ; do \
+ for flag in $(EXTRA_HOST_FLAGS) V=1; do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
echo "Doing info in isl" ; \
@@ -13602,7 +13602,7 @@ dvi-isl: \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
- for flag in $(EXTRA_HOST_FLAGS) ; do \
+ for flag in $(EXTRA_HOST_FLAGS) V=1; do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
echo "Doing dvi in isl" ; \
@@ -13627,7 +13627,7 @@ pdf-isl: \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
- for flag in $(EXTRA_HOST_FLAGS) ; do \
+ for flag in $(EXTRA_HOST_FLAGS) V=1; do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
echo "Doing pdf in isl" ; \
@@ -13652,7 +13652,7 @@ html-isl: \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
- for flag in $(EXTRA_HOST_FLAGS) ; do \
+ for flag in $(EXTRA_HOST_FLAGS) V=1; do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
echo "Doing html in isl" ; \
@@ -13677,7 +13677,7 @@ TAGS-isl: \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
- for flag in $(EXTRA_HOST_FLAGS) ; do \
+ for flag in $(EXTRA_HOST_FLAGS) V=1; do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
echo "Doing TAGS in isl" ; \
@@ -13703,7 +13703,7 @@ install-info-isl: \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
- for flag in $(EXTRA_HOST_FLAGS) ; do \
+ for flag in $(EXTRA_HOST_FLAGS) V=1; do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
echo "Doing install-info in isl" ; \
@@ -13729,7 +13729,7 @@ install-pdf-isl: \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
- for flag in $(EXTRA_HOST_FLAGS) ; do \
+ for flag in $(EXTRA_HOST_FLAGS) V=1; do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
echo "Doing install-pdf in isl" ; \
@@ -13755,7 +13755,7 @@ install-html-isl: \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
- for flag in $(EXTRA_HOST_FLAGS) ; do \
+ for flag in $(EXTRA_HOST_FLAGS) V=1; do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
echo "Doing install-html in isl" ; \
@@ -13780,7 +13780,7 @@ installcheck-isl: \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
- for flag in $(EXTRA_HOST_FLAGS) ; do \
+ for flag in $(EXTRA_HOST_FLAGS) V=1; do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
echo "Doing installcheck in isl" ; \
@@ -13804,7 +13804,7 @@ mostlyclean-isl:
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
- for flag in $(EXTRA_HOST_FLAGS) ; do \
+ for flag in $(EXTRA_HOST_FLAGS) V=1; do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
echo "Doing mostlyclean in isl" ; \
@@ -13828,7 +13828,7 @@ clean-isl:
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
- for flag in $(EXTRA_HOST_FLAGS) ; do \
+ for flag in $(EXTRA_HOST_FLAGS) V=1; do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
echo "Doing clean in isl" ; \
@@ -13852,7 +13852,7 @@ distclean-isl:
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
- for flag in $(EXTRA_HOST_FLAGS) ; do \
+ for flag in $(EXTRA_HOST_FLAGS) V=1; do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
echo "Doing distclean in isl" ; \
@@ -13876,7 +13876,7 @@ maintainer-clean-isl:
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
- for flag in $(EXTRA_HOST_FLAGS) ; do \
+ for flag in $(EXTRA_HOST_FLAGS) V=1; do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
echo "Doing maintainer-clean in isl" ; \
diff --git a/configure b/configure
index 9976d0d95bf..c21fefde54f 100755
--- a/configure
+++ b/configure
@@ -646,12 +646,14 @@ stage1_languages
extra_host_libiberty_configure_flags
clooginc
clooglibs
+extra_cloog_isl_configure_flags
islinc
isllibs
poststage1_ldflags
poststage1_libs
stage1_libs
stage1_ldflags
+extra_isl_gmp_configure_flags
extra_mpc_mpfr_configure_flags
extra_mpc_gmp_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;
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_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
# 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
@@ -5542,6 +5545,7 @@ fi
+
# Allow host libstdc++ to be specified for static linking with PPL.
# Check whether --with-host-libstdcxx was given.
@@ -5671,10 +5675,12 @@ fi
if test "x${with_isl_lib}" != x; then
isllibs="-L$with_isl_lib"
fi
+ extra_cloog_isl_configure_flags='--with-isl=system'
if test "x${islinc}" = x && test "x${isllibs}" = x \
&& test -d ${srcdir}/isl; then
isllibs='-L$$r/$(HOST_SUBDIR)/isl/'"$lt_cv_objdir"' '
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
fi
@@ -5684,6 +5690,7 @@ fi
+
if test "x$with_isl" != "xno"; then
if test "${ENABLE_ISL_CHECK}" = yes ; then
diff --git a/configure.ac b/configure.ac
index 9a23049a6ae..b4e1266a921 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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"
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_isl_gmp_configure_flags='--with-gmp-builddir=$$r/$(HOST_SUBDIR)/gmp'
# 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
# but it would be included on the link line in the version check below
@@ -1453,6 +1454,7 @@ AC_SUBST(gmpinc)
AC_SUBST(extra_mpfr_configure_flags)
AC_SUBST(extra_mpc_gmp_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.
AC_ARG_WITH(host-libstdcxx,
View Lorry Controller Status