Skip to content

Commit 8ce7358

Browse files
committed
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.
2 parents bd93816 + 1fac8a4 commit 8ce7358

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

mk/tests.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,7 @@ CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) := \
623623
--lldb-python $$(CFG_LLDB_PYTHON) \
624624
--gdb-version="$(CFG_GDB_VERSION)" \
625625
--lldb-version="$(CFG_LLDB_VERSION)" \
626-
--android-cross-path=$(CFG_ANDROID_CROSS_PATH) \
626+
--android-cross-path=$(CFG_ARM_LINUX_ANDROIDEABI_NDK) \
627627
--adb-path=$(CFG_ADB) \
628628
--adb-test-dir=$(CFG_ADB_TEST_DIR) \
629629
--host-rustcflags "$(RUSTC_FLAGS_$(3)) $$(CTEST_RUSTC_FLAGS) -L $$(RT_OUTPUT_DIR_$(3))" \

0 commit comments

Comments
 (0)