github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

Add -lstdc++ -lsupc++ in configure.ac not in android-config 

Also make sure that those flags do not appear in libwslay LIBS.
pull/25/merge
Tatsuhiro Tsujikawa 2012-07-29 22:52:16 +09:00
parent c1ddf34e4b
commit 674581a8d6
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
android-config
View File

@ -52,7 +52,6 @@ PATH=$TOOLCHAIN/bin:$PATH
--with-libz --with-libz-prefix=$PREFIX \ --with-libz --with-libz-prefix=$PREFIX \
CXXFLAGS="-Os -g" \ CXXFLAGS="-Os -g" \
CFLAGS="-Os -g" \ CFLAGS="-Os -g" \
LIBS="-lstdc++ -lsupc++" \
LDFLAGS="-L$PREFIX/lib" \ LDFLAGS="-L$PREFIX/lib" \
PKG_CONFIG_LIBDIR="$PREFIX/lib/pkgconfig" \ PKG_CONFIG_LIBDIR="$PREFIX/lib/pkgconfig" \
ZLIB_LIBS="-lz" \ ZLIB_LIBS="-lz" \

8
configure.ac
View File

@ -612,6 +612,14 @@ AM_CONDITIONAL([ENABLE_WEBSOCKET], [test "x$enable_websocket" = "xyes"])
AC_SUBST([bashcompletiondir]) AC_SUBST([bashcompletiondir])
case "$host" in
*android*)
LIBS="$LIBS -lstdc++ -lsupc++"
;;
*)
;;
esac
if test "x$ARIA2_STATIC" = "xyes"; then if test "x$ARIA2_STATIC" = "xyes"; then
LDFLAGS="$LDFLAGS -all-static -static-libgcc -static-libstdc++" LDFLAGS="$LDFLAGS -all-static -static-libgcc -static-libstdc++"
dnl For non-MinGW build, we need additional libs for static build. dnl For non-MinGW build, we need additional libs for static build.