diff --git a/src/tools/builtin.jam b/src/tools/builtin.jam index 176de13..d62680a 100644 --- a/src/tools/builtin.jam +++ b/src/tools/builtin.jam @@ -40,7 +40,7 @@ import convert ; import generate ; -.os-names = aix bsd cygwin darwin freebsd hpux iphone linux netbsd openbsd osf +.os-names = aix android bsd cygwin darwin freebsd hpux iphone linux netbsd openbsd osf qnx qnxnto sgi solaris unix unixware windows elf # Not actually an OS -- used for targeting bare metal where object # format is ELF. This catches both -elf and -eabi gcc targets and well diff --git a/src/tools/gcc.jam b/src/tools/gcc.jam index ef90f05..c8964d1 100644 --- a/src/tools/gcc.jam +++ b/src/tools/gcc.jam @@ -1025,6 +1025,7 @@ rule setup-threading ( targets * : sources * : properties * ) switch $(target) { + case android: # No threading options, everything is in already. case windows : option = -mthreads ; case cygwin : option = -mthreads ; case solaris : option = -pthreads ; libs = rt ;