diff options
| author | bors <bors@rust-lang.org> | 2016-04-25 18:48:05 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-04-25 18:48:05 -0700 |
| commit | 8ce735858d97fbabffa1d78d29fb644cd7c4f845 (patch) | |
| tree | 4b615dae64b5891ce8114bc3b68183dd4013fc7e | |
| parent | bd938166d6dabc689777555d5046dce893555eb7 (diff) | |
| parent | 1fac8a45641e203698958e8101a8886ded52d336 (diff) | |
| download | rust-8ce735858d97fbabffa1d78d29fb644cd7c4f845.tar.gz rust-8ce735858d97fbabffa1d78d29fb644cd7c4f845.zip | |
Auto merge of #33210 - alexcrichton:fix-ndk-dir, r=alexcrichton
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.mk | 2 |
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))" \ |