Auto merge of #27856 - nikomatsakis:move-def-id-to-rustc, r=eddyb

[rust.git] / configure

diff --git a/configure b/configure
index 2c8d78598b2d354233b928dc2eb5b71c0cab5f9a..dc9d7d75310c6b795d87259eb40c4f8637456860 100755 (executable)
--- a/configure
+++ b/configure
@@ -607,6 +607,10 @@ valopt aarch64-linux-android-ndk "" "aarch64-linux-android NDK standalone path"
 valopt release-channel "dev" "the name of the release channel to build"
 valopt musl-root "/usr/local" "MUSL root installation directory"
 
+# Used on systems where "cc" and "ar" are unavailable
+valopt default-linker "cc" "the default linker"
+valopt default-ar     "ar" "the default ar"
+
 # Many of these are saved below during the "writing configuration" step
 # (others are conditionally saved).
 opt_nosave manage-submodules 1 "let the build manage the git submodules"
@@ -1428,9 +1432,10 @@ do
         LLVM_BUILD_DIR=
         LLVM_INST_DIR=$CFG_LLVM_ROOT
         do_reconfigure=0
+        # Check that LLVm FileCheck is available. Needed for the tests
+        need_cmd $LLVM_INST_DIR/bin/FileCheck
     fi
 
-
     if [ ${do_reconfigure} -ne 0 ]
     then
     # because git is hilarious, it might have put the module index