| Index: Makefile
|
| diff --git a/Makefile b/Makefile
|
| index 07549a369b8a21e75c71ce7c59e47f903cccac04..0d573d7a4116c417edb29015cd457614a9c55e6f 100644
|
| --- a/Makefile
|
| +++ b/Makefile
|
| @@ -34,6 +34,7 @@ TESTJOBS ?= -j16
|
| GYPFLAGS ?=
|
| TESTFLAGS ?=
|
| ANDROID_NDK_ROOT ?=
|
| +ANDROID_TOOLCHAIN ?=
|
| ANDROID_V8 ?= /data/local/v8
|
|
|
| # Special build flags. Use them like this: "make library=shared"
|
| @@ -141,7 +142,7 @@ ENVFILE = $(OUTDIR)/environment
|
| $(ARCHES) $(MODES) $(BUILDS) $(CHECKS) $(addsuffix .clean,$(ARCHES)) \
|
| $(addsuffix .check,$(MODES)) $(addsuffix .check,$(ARCHES)) \
|
| $(ANDROID_ARCHES) $(ANDROID_BUILDS) $(ANDROID_CHECKS) \
|
| - must-set-ANDROID_NDK_ROOT
|
| + must-set-ANDROID_NDK_ROOT_OR_TOOLCHAIN
|
|
|
| # Target definitions. "all" is the default.
|
| all: $(MODES)
|
| @@ -178,7 +179,7 @@ native: $(OUTDIR)/Makefile.native
|
| $(ANDROID_ARCHES): $(addprefix $$@.,$(MODES))
|
|
|
| $(ANDROID_BUILDS): $(GYPFILES) $(ENVFILE) build/android.gypi \
|
| - must-set-ANDROID_NDK_ROOT Makefile.android
|
| + must-set-ANDROID_NDK_ROOT_OR_TOOLCHAIN Makefile.android
|
| @$(MAKE) -f Makefile.android $@ \
|
| ARCH="$(basename $@)" \
|
| MODE="$(subst .,,$(suffix $@))" \
|
| @@ -248,9 +249,11 @@ $(OUTDIR)/Makefile.native: $(GYPFILES) $(ENVFILE)
|
| build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \
|
| -Ibuild/standalone.gypi --depth=. -S.native $(GYPFLAGS)
|
|
|
| -must-set-ANDROID_NDK_ROOT:
|
| +must-set-ANDROID_NDK_ROOT_OR_TOOLCHAIN:
|
| ifndef ANDROID_NDK_ROOT
|
| - $(error ANDROID_NDK_ROOT is not set)
|
| +ifndef ANDROID_TOOLCHAIN
|
| + $(error ANDROID_NDK_ROOT or ANDROID_TOOLCHAIN must be set))
|
| +endif
|
| endif
|
|
|
| # Replaces the old with the new environment file if they're different, which
|
|
|