Skip to content

Commit 1f31202

Browse files
committed
Attempting to fix compilation error for armeabi
1 parent fe9f93a commit 1f31202

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

build.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ cd $BUILDDIR/$ARCH
116116

117117
env CFLAGS="-I$NDK/sources/android/support/include -frtti -fexceptions -I$BUILDDIR/$ARCH/include" \
118118
LDFLAGS="-frtti -fexceptions -L$BUILDDIR/$ARCH/lib" \
119-
LIBS="-L$BUILDDIR/$ARCH -landroid_support -lgnustl_static -lstdc++" \
119+
LIBS="-L$BUILDDIR/$ARCH -landroid_support -lgnustl_static -lstdc++ -latomic" \
120120
$BUILDDIR/setCrossEnvironment-$ARCH.sh \
121121
./configure \
122122
--host=$GCCPREFIX \
@@ -167,7 +167,7 @@ cd $BUILDDIR/$ARCH
167167

168168
env CFLAGS="-I$NDK/sources/android/support/include -frtti -fexceptions -include $BUILDDIR/ndk-r15-64-bit-fix.h" \
169169
LDFLAGS="-frtti -fexceptions -L$BUILDDIR/$ARCH/lib" \
170-
LIBS="-L$BUILDDIR/$ARCH -landroid_support -lgnustl_static -lstdc++" \
170+
LIBS="-L$BUILDDIR/$ARCH -landroid_support -lgnustl_static -lstdc++ -latomic" \
171171
$BUILDDIR/setCrossEnvironment-$ARCH.sh \
172172
./configure \
173173
--host=$GCCPREFIX \
@@ -217,7 +217,7 @@ cd $BUILDDIR/$ARCH
217217
env CFLAGS="-I$NDK/sources/android/support/include -frtti -fexceptions" \
218218
CXXFLAGS="-std=c++11" \
219219
LDFLAGS="-frtti -fexceptions" \
220-
LIBS="-L$BUILDDIR/$ARCH -landroid_support -lgnustl_static -lstdc++" \
220+
LIBS="-L$BUILDDIR/$ARCH -landroid_support -lgnustl_static -lstdc++ -latomic" \
221221
HARFBUZZ_CFLAGS="-I$BUILDDIR/$ARCH/include/harfbuzz" \
222222
HARFBUZZ_LIBS="-L$BUILDDIR/$ARCH/lib -lharfbuzz" \
223223
ICU_CFLAGS="-I$BUILDDIR/$ARCH/include" \
@@ -251,7 +251,7 @@ cd $BUILDDIR/$ARCH
251251

252252
env CFLAGS="-I$NDK/sources/android/support/include -frtti -fexceptions -include $BUILDDIR/ndk-r15-64-bit-fix.h" \
253253
LDFLAGS="-frtti -fexceptions -L$BUILDDIR/$ARCH/lib" \
254-
LIBS="-L$BUILDDIR/$ARCH -landroid_support -lgnustl_static -lstdc++" \
254+
LIBS="-L$BUILDDIR/$ARCH -landroid_support -lgnustl_static -lstdc++ -latomic" \
255255
ICULEHB_CFLAGS="-I$BUILDDIR/$ARCH/include/icu-le-hb" \
256256
ICULEHB_LIBS="-licu-le-hb" \
257257
$BUILDDIR/setCrossEnvironment-$ARCH.sh \

0 commit comments

Comments
 (0)