| Index: native_client_sdk/src/build_tools/library.mk
|
| diff --git a/native_client_sdk/src/build_tools/library.mk b/native_client_sdk/src/build_tools/library.mk
|
| index 9e8a9d64b558793868b75b00f264413a58c7e460..5418593ac0f9cef69d612ea4a58495df689f775f 100644
|
| --- a/native_client_sdk/src/build_tools/library.mk
|
| +++ b/native_client_sdk/src/build_tools/library.mk
|
| @@ -25,6 +25,14 @@ NACL_CCFLAGS:=-O0 -g -pthread $(NACL_WARNINGS)
|
| NACL_CXXFLAGS:= -O0 -g -pthread -std=gnu++98 $(NACL_WARNINGS)
|
| NACL_LDFLAGS:=-Wl,-as-needed -g -pthread -lppapi_cpp -lppapi
|
|
|
| +
|
| +#
|
| +# Compute path to requested NaCl Toolchain
|
| +#
|
| +OSNAME:=$(shell python $(NACL_SDK_ROOT)/tools/getos.py)
|
| +TC_PATH:=$(abspath $(NACL_SDK_ROOT)/toolchain)
|
| +
|
| +
|
| #
|
| # Project Settings
|
| #
|
| @@ -50,18 +58,11 @@ RM:=python $(NACL_SDK_ROOT)/tools/oshelpers.py rm
|
| #
|
| ifeq (,$(findstring $(TOOLCHAIN),$(VALID_TOOLCHAINS)))
|
| $(warning Availbile choices are: $(VALID_TOOLCHAINS))
|
| -$(error Can not use TOOLCHAIN=$(TOOLCHAIN) on this example.)
|
| +$(error Can not use TOOLCHAIN=$(TOOLCHAIN) on this library.)
|
| endif
|
|
|
|
|
| #
|
| -# Compute path to requested NaCl Toolchain
|
| -#
|
| -OSNAME:=$(shell python $(NACL_SDK_ROOT)/tools/getos.py)
|
| -TC_PATH:=$(abspath $(NACL_SDK_ROOT)/toolchain)
|
| -
|
| -
|
| -#
|
| # Verify we have a valid NACL_SDK_ROOT by looking for the toolchain directory
|
| #
|
| ifeq (,$(wildcard $(TC_PATH)))
|
|
|