about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2016-04-25 18:35:58 -0700
committerAlex Crichton <alex@alexcrichton.com>2016-04-25 18:35:58 -0700
commit1fac8a45641e203698958e8101a8886ded52d336 (patch)
tree741d463c711939c622612e85e12e866dc24eae93
parentcfae4dea875ddcc5f23481106a149ea15b6be1e5 (diff)
downloadrust-1fac8a45641e203698958e8101a8886ded52d336.tar.gz
rust-1fac8a45641e203698958e8101a8886ded52d336.zip
mk: Fix use of deprecated configure var
The `--android-cross-path` has been deprecated for some time now, we should use
`CFG_ARM_LINUX_ANDROIDEABI_NDK` instead.

Ideally this would use the right triple, but we're only testing ARM for now.
-rw-r--r--mk/tests.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/mk/tests.mk b/mk/tests.mk
index 1c65a09cbc4..f5a499105be 100644
--- a/mk/tests.mk
+++ b/mk/tests.mk
@@ -623,7 +623,7 @@ CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) := \
 	--lldb-python $$(CFG_LLDB_PYTHON) \
         --gdb-version="$(CFG_GDB_VERSION)" \
         --lldb-version="$(CFG_LLDB_VERSION)" \
-        --android-cross-path=$(CFG_ANDROID_CROSS_PATH) \
+        --android-cross-path=$(CFG_ARM_LINUX_ANDROIDEABI_NDK) \
         --adb-path=$(CFG_ADB) \
         --adb-test-dir=$(CFG_ADB_TEST_DIR) \
         --host-rustcflags "$(RUSTC_FLAGS_$(3)) $$(CTEST_RUSTC_FLAGS) -L $$(RT_OUTPUT_DIR_$(3))" \