[Android] Require gcc 4.6, as 4.4.3 is buggy with threading code

Rafaël Carré git at videolan.org
Wed Oct 10 19:06:05 CEST 2012


vlc-ports/android | branch: master | Rafaël Carré <funman at videolan.org> | Wed Oct 10 18:46:45 2012 +0200| [27c318e95c5ac11891e496f0f3ff51444523e315] | committer: Rafaël Carré

Require gcc 4.6, as 4.4.3 is buggy with threading code

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=27c318e95c5ac11891e496f0f3ff51444523e315
---

 compile.sh |   15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/compile.sh b/compile.sh
index 1771c4c..c665003 100755
--- a/compile.sh
+++ b/compile.sh
@@ -15,19 +15,14 @@ fi
 # try to detect NDK version
 REL=$(grep -o '^r[0-9]*.*' $ANDROID_NDK/RELEASE.TXT 2>/dev/null|cut -b2-)
 case "$REL" in
-    7|8)
-        # NDK > v7, only gcc 4.4.3 available
-        GCCVER=4.4.3
-        CXXSTL=""
-    ;;
     8?)
         # NDK >= v8b, both 4.4.3 and 4.6 available,
-        # we use 4.4.3 because there is a regression in gcc 4.6, DECL_USER_ALIGN is not handled properly
-        GCCVER=4.4.3
-        CXXSTL="/4.4.3"
+        # we use 4.6 because 4.4.3 doesn't handle threads correctly.
+        GCCVER=4.6
+        CXXSTL="/4.6"
     ;;
-    *)
-        echo "You need the NDKv7 or later"
+    7|8|*)
+        echo "You need the NDKv8b or later"
         exit 1
     ;;
 esac



More information about the Android mailing list