From 63750f8841740fec049bb93d969da9312bfed141 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Mon, 29 Nov 2010 00:50:21 +0100
Subject: complibs/cloog: fix linking with libstdc++

This rules out 0.15.5 and previous versions, that did not
have this option, so remove them from the list. Anyway,
they were marked 'OBSOLETE', so it's not a big loss...

[Yann E. MORIN: remove obsolete versions]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

diff --git a/config/companion_libs/cloog.in b/config/companion_libs/cloog.in
index df29853..6282997 100644
--- a/config/companion_libs/cloog.in
+++ b/config/companion_libs/cloog.in
@@ -26,21 +26,6 @@ config CLOOG_V_0_15_6
     bool
     prompt "0.15.6"
 
-config CLOOG_V_0_15_5
-    bool
-    prompt "0.15.5 (OBSOLETE)"
-    depends on OBSOLETE
-
-config CLOOG_V_0_15_4
-    bool
-    prompt "0.15.4 (OBSOLETE)"
-    depends on OBSOLETE
-
-config CLOOG_V_0_15_3
-    bool
-    prompt "0.15.3 (OBSOLETE)"
-    depends on OBSOLETE
-
 endchoice
 
 config CLOOG_VERSION
diff --git a/scripts/build/companion_libs/cloog.sh b/scripts/build/companion_libs/cloog.sh
index 34c72c1..a535dc0 100644
--- a/scripts/build/companion_libs/cloog.sh
+++ b/scripts/build/companion_libs/cloog.sh
@@ -55,7 +55,8 @@ do_cloog() {
         cloog_opts+=( --enable-shared --disable-static )
     else
         cloog_opts+=( --disable-shared --enable-static )
-        cloog_LDFLAGS='-lstdc++ -lm'
+        cloog_opts+=( --with-host-libstdcxx='-lstdc++' )
+        cloog_LDFLAGS='-lm'
     fi
 
     CFLAGS="${CT_CFLAGS_FOR_HOST}"              \
-- 
cgit v0.10.2-6-g49f6