1 diff -urp boost_1_55_0.orig/tools/build/v2/tools/builtin.jam boost_1_55_0/tools/build/v2/tools/builtin.jam
2 --- boost_1_55_0.orig/tools/build/v2/tools/builtin.jam 2014-04-04 20:31:24.240657506 +0200
3 +++ boost_1_55_0/tools/build/v2/tools/builtin.jam 2014-04-04 20:31:38.951319126 +0200
4 @@ -41,7 +41,7 @@ import generate ;
7 .os-names = aix bsd cygwin darwin freebsd hpux iphone linux netbsd openbsd osf
8 - qnx qnxnto sgi solaris unix unixware windows
9 + qnx qnxnto sgi solaris unix unixware windows android
10 elf # Not actually an OS -- used for targeting bare metal where object
11 # format is ELF. This catches both -elf and -eabi gcc targets and well
12 # as other compilers targeting ELF. It is not clear how often we need
13 diff -urp boost_1_55_0.orig/tools/build/v2/tools/gcc.jam boost_1_55_0/tools/build/v2/tools/gcc.jam
14 --- boost_1_55_0.orig/tools/build/v2/tools/gcc.jam 2014-04-04 20:22:10.431667807 +0200
15 +++ boost_1_55_0/tools/build/v2/tools/gcc.jam 2014-04-04 20:35:34.859039773 +0200
16 @@ -1032,6 +1032,7 @@ rule setup-threading ( targets * : sourc
17 case *bsd : option = -pthread ; # There is no -lrt on BSD.
18 case sgi : # gcc on IRIX does not support multi-threading.
19 case darwin : # No threading options.
20 + case android : # No threading options.
21 case * : option = -pthread ; libs = rt ;