File tree Expand file tree Collapse file tree 2 files changed +7
-4
lines changed Expand file tree Collapse file tree 2 files changed +7
-4
lines changed Original file line number Diff line number Diff line change 1
1
diff --git a/build-android.sh b/build-android.sh
2
- index 40453f7..0bd39ae 100755
2
+ index 40453f7..dd92f74 100755
3
3
--- a/build-android.sh
4
4
+++ b/build-android.sh
5
5
@@ -258,9 +258,9 @@ case "$NDK_RN" in
@@ -23,7 +23,7 @@ index 40453f7..0bd39ae 100755
23
23
24
24
cxxflags=""
25
25
for flag in $CXXFLAGS; do cxxflags="$cxxflags cxxflags=$flag"; done
26
- @@ -404,6 +405,10 @@ echo "Building boost for android"
26
+ @@ -404,8 +405,12 @@ echo "Building boost for android"
27
27
threading=multi \
28
28
--layout=versioned \
29
29
--prefix="./../$BUILD_DIR/" \
@@ -32,8 +32,11 @@ index 40453f7..0bd39ae 100755
32
32
+ boost.locale.iconv=on \
33
33
+ boost.locale.icu=off \
34
34
$LIBRARIES \
35
- install 2>&1 \
35
+ - install 2>&1 \
36
+ + release debug install 2>&1 \
36
37
|| { dump "ERROR: Failed to build boost for android!" ; exit 1 ; }
38
+ } | tee -a $PROGDIR/build.log
39
+
37
40
diff --git a/configs/user-config-boost-1_55_0.jam b/configs/user-config-boost-1_55_0.jam
38
41
index 666d4c8..5f6bab8 100644
39
42
--- a/configs/user-config-boost-1_55_0.jam
Original file line number Diff line number Diff line change @@ -39,7 +39,7 @@ DO_BOOST=1
39
39
DO_OPENSSL=1
40
40
41
41
function usage {
42
- echo " Usage: $0 [--skip-boost] [--skip-openssl] [-h] [--ndk <android-ndk>]"
42
+ echo " Usage: $0 [--skip-boost] [--skip-openssl] [--skip-libiconv] [- h] [--ndk <android-ndk>]"
43
43
echo " "
44
44
echo " --skip-boost Skip fetching and compiling boost"
45
45
echo " --skip-openssl Skip fetching and compiling openssl"
You can’t perform that action at this time.
0 commit comments