Skip to content

Commit 77064c9

Browse files
zhuoweiAndrewSB
authored andcommitted
Actually use libc++_shared as STL
1 parent 842cf50 commit 77064c9

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

setCrossEnvironment-armeabi-v7a.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
1+
#!/bin/bash
22

33
NDK_STL="libc++"
44

@@ -35,9 +35,11 @@ ARCH=armeabi-v7a
3535
STL_CFLAGS="-isystem$NDK/sources/cxx-stl/gnu-libstdc++/$GCCVER/include \
3636
-isystem$NDK/sources/cxx-stl/gnu-libstdc++/$GCCVER/libs/$ARCH/include"
3737
STL_LDFLAGS="-L$NDK/sources/cxx-stl/gnu-libstdc++/$GCCVER/libs/$ARCH"
38-
if [[ "$NDK_STL" -eq "libc++" ]] ; then
39-
STL_CFLAGS="-isystem$NDK/sources/cxx-stl/llvm-libc++/include"
38+
STL_LDLIB="-lgnustl_shared -lsupc++"
39+
if [[ "$NDK_STL" == "libc++" ]] ; then
40+
STL_CFLAGS="-isystem$NDK/sources/cxx-stl/llvm-libc++/libcxx/include"
4041
STL_LDFLAGS="-L$NDK/sources/cxx-stl/llvm-libc++/libs/$ARCH"
42+
STL_LDLIB="-lc++_shared"
4143
fi
4244

4345
CFLAGS="

0 commit comments

Comments
 (0)