Index: native_client_sdk/src/tools/common.mk |
diff --git a/native_client_sdk/src/tools/common.mk b/native_client_sdk/src/tools/common.mk |
index c3227985c1c9d84fd77bc5143a11d192e15bad25..d385bcf7fa2e648e946c84413d25adca486d98e9 100644 |
--- a/native_client_sdk/src/tools/common.mk |
+++ b/native_client_sdk/src/tools/common.mk |
@@ -14,7 +14,11 @@ |
# If your project only builds in one or the other then this should be overridden |
# accordingly. |
# |
+ifneq ($(ENABLE_BIONIC),) |
+ALL_TOOLCHAINS ?= pnacl glibc clang-newlib bionic |
+else |
ALL_TOOLCHAINS ?= pnacl glibc clang-newlib |
+endif |
VALID_TOOLCHAINS ?= $(ALL_TOOLCHAINS) |
TOOLCHAIN ?= $(word 1,$(VALID_TOOLCHAINS)) |
@@ -424,7 +428,7 @@ |
include $(NACL_SDK_ROOT)/tools/host_vc.mk |
endif |
-ifneq (,$(findstring $(TOOLCHAIN),glibc clang-newlib)) |
+ifneq (,$(findstring $(TOOLCHAIN),glibc bionic clang-newlib)) |
include $(NACL_SDK_ROOT)/tools/nacl_gcc.mk |
endif |