native_client_sdk/src/tools/common.mk - Issue 1489103002: [NaCl SDK] Remove support for bionic toolchain

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: native_client_sdk/src/tools/common.mk

Issue 1489103002: [NaCl SDK] Remove support for bionic toolchain (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

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 d385bcf7fa2e648e946c84413d25adca486d98e9..c3227985c1c9d84fd77bc5143a11d192e15bad25 100644

--- a/native_client_sdk/src/tools/common.mk

+++ b/native_client_sdk/src/tools/common.mk

@@ -14,11 +14,7 @@

# 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))

@@ -428,7 +424,7 @@ ifneq (,$(findstring $(TOOLCHAIN),win))

include $(NACL_SDK_ROOT)/tools/host_vc.mk

endif

-ifneq (,$(findstring $(TOOLCHAIN),glibc bionic clang-newlib))

+ifneq (,$(findstring $(TOOLCHAIN),glibc clang-newlib))

include $(NACL_SDK_ROOT)/tools/nacl_gcc.mk

endif