From f72da8f08a91cba74a1256c19d67a25bfdcf9f31 Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Tue, 7 Aug 2012 00:09:14 +0200 Subject: [PATCH] gcc: changed to only set ppl and cloog path if both are installed effectively Note: Those are needed for the Graphite loop optimization but are optional! --- base/gcc/gcc.conf | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/base/gcc/gcc.conf b/base/gcc/gcc.conf index e0a7bed11..c5f38e870 100644 --- a/base/gcc/gcc.conf +++ b/base/gcc/gcc.conf @@ -128,12 +128,16 @@ var_append extraconfopt ' ' "--with-mpfr-include=$( pkgprefix -r includedir mpfr var_append extraconfopt ' ' "--with-mpc=$( pkgprefix -r libmpc )" var_append extraconfopt ' ' "--with-mpc-lib=$( pkgprefix -r libdir libmpc )" var_append extraconfopt ' ' "--with-mpc-include=$( pkgprefix -r includedir libmpc )" -var_append extraconfopt ' ' "--with-ppl=$( pkgprefix -r ppl )" -var_append extraconfopt ' ' "--with-ppl-lib=$( pkgprefix -r libdir ppl )" -var_append extraconfopt ' ' "--with-ppl-include=$( pkgprefix -r includedir ppl )" -var_append extraconfopt ' ' "--with-cloog=$( pkgprefix -r cloog )" -var_append extraconfopt ' ' "--with-cloog-lib=$( pkgprefix -r libdir cloog )" -var_append extraconfopt ' ' "--with-cloog-include=$( pkgprefix -r includedir cloog )" + +# Graphite loop optimization +if pkginstalled -f cloog && pkginstalled -f ppl; then + var_append extraconfopt ' ' "--with-ppl=$( pkgprefix -r ppl )" + var_append extraconfopt ' ' "--with-ppl-lib=$( pkgprefix -r libdir ppl )" + var_append extraconfopt ' ' "--with-ppl-include=$( pkgprefix -r includedir ppl )" + var_append extraconfopt ' ' "--with-cloog=$( pkgprefix -r cloog )" + var_append extraconfopt ' ' "--with-cloog-lib=$( pkgprefix -r libdir cloog )" + var_append extraconfopt ' ' "--with-cloog-include=$( pkgprefix -r includedir cloog )" +fi if atstage toolchain; then bindir="/$prefix/crosscc"