Skip to content

Commit

Permalink
[run-boost-tests] Link with compiler_rt when building by clang
Browse files Browse the repository at this point in the history
Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
  • Loading branch information
dmsck committed Mar 19, 2015
1 parent 1cfd139 commit 523d01d
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions tests/run-boost-tests
Expand Up @@ -433,6 +433,7 @@ generate_toolchain()

local SYSROOT=$NDK_DIR/platforms/android-$APILEVEL/arch-$ARCH
local GNULIBCXX=$NDK_DIR/sources/cxx-stl/gnu-libstdc++/$GNULIBCXX_VERSION
local COMPILERRT=$NDK_DIR/sources/android/compiler-rt

FLAGS="$FLAGS --sysroot=$SYSROOT"

Expand All @@ -445,6 +446,10 @@ generate_toolchain()
FLAGS="$FLAGS -g"

LLIBS="-lgnustl_shared"
case $TOOLCHAIN_TYPE in
clang)
LLIBS="$LLIBS -lcompiler_rt_static"
esac

local TOOL
for TOOL in $CCS; do
Expand Down Expand Up @@ -482,6 +487,7 @@ if [ "x\$LINKER" = "xyes" ]; then
fi
FLAGS="\$FLAGS -L$LIBCRYSTAX/libs/$ABI"
FLAGS="\$FLAGS -L$GNULIBCXX/libs/$ABI"
FLAGS="\$FLAGS -L$COMPILERRT/libs/$ABI"
else
if [ "x$ICU" != "x" ]; then
FLAGS="\$FLAGS -I$ICU/include"
Expand Down

0 comments on commit 523d01d

Please sign in to comment.