Skip to content

Commit 6fbe6de

Browse files
committed
configure: Remove miscellaneous program probes
All of these should be handled by rustbuild in sanity.rs right now.
1 parent e9b341a commit 6fbe6de

File tree

1 file changed

+0
-49
lines changed

1 file changed

+0
-49
lines changed

configure

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -820,51 +820,6 @@ if [ $(echo $python_version | grep -c '^Python 2\.7') -ne 1 ]; then
820820
err "Found $python_version, but Python 2.7 is required"
821821
fi
822822

823-
probe CFG_CLANG clang++
824-
probe CFG_CCACHE ccache
825-
probe CFG_GCC gcc
826-
probe CFG_LD ld
827-
probe CFG_VALGRIND valgrind
828-
probe CFG_PERF perf
829-
probe CFG_ISCC iscc
830-
probe CFG_ANTLR4 antlr4
831-
probe CFG_GRUN grun
832-
probe CFG_FLEX flex
833-
probe CFG_BISON bison
834-
probe CFG_GDB gdb
835-
probe CFG_LLDB lldb
836-
837-
if [ -n "$CFG_ENABLE_NINJA" ]
838-
then
839-
probe CFG_NINJA ninja
840-
if [ -z "$CFG_NINJA" ]
841-
then
842-
# On Debian and Fedora, the `ninja` binary is an IRC bot, so the build tool was
843-
# renamed. Handle this case.
844-
probe CFG_NINJA ninja-build
845-
fi
846-
fi
847-
848-
# For building LLVM
849-
if [ -z "$CFG_LLVM_ROOT" ]
850-
then
851-
probe_need CFG_CMAKE cmake
852-
fi
853-
854-
# On MacOS X, invoking `javac` pops up a dialog if the JDK is not
855-
# installed. Since `javac` is only used if `antlr4` is available,
856-
# probe for it only in this case.
857-
if [ -n "$CFG_ANTLR4" ]
858-
then
859-
CFG_ANTLR4_JAR="\"$(find /usr/ -name antlr-complete.jar 2>/dev/null | head -n 1)\""
860-
if [ "x" = "x$CFG_ANTLR4_JAR" ]
861-
then
862-
CFG_ANTLR4_JAR="\"$(find ~ -name antlr-complete.jar 2>/dev/null | head -n 1)\""
863-
fi
864-
putvar CFG_ANTLR4_JAR $CFG_ANTLR4_JAR
865-
probe CFG_JAVAC javac
866-
fi
867-
868823
# the valgrind rpass tests will fail if you don't have a valgrind, but they're
869824
# only disabled if you opt out.
870825
if [ -z "$CFG_VALGRIND" ]
@@ -926,10 +881,6 @@ if [ -n "$RUST_DIST_SERVER" -a -n "$ALLOW_NONZERO_RLIMIT_CORE" ]; then
926881
fi
927882
fi
928883

929-
step_msg "looking for target specific programs"
930-
931-
probe CFG_ADB adb
932-
933884
BIN_SUF=
934885
if [ "$CFG_OSTYPE" = "pc-windows-gnu" ] || [ "$CFG_OSTYPE" = "pc-windows-msvc" ]
935886
then

0 commit comments

Comments
 (0)