diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2017-02-12 10:23:09 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2017-03-11 08:41:10 -0800 |
| commit | e019f133a00acd4775be589cec8ed7c99eb5025b (patch) | |
| tree | f75340a8be62dc632bb7f6e84def7dc942722763 /configure | |
| parent | b326bd31e516953d6434096755900f6dee7b3e48 (diff) | |
| download | rust-e019f133a00acd4775be589cec8ed7c99eb5025b.tar.gz rust-e019f133a00acd4775be589cec8ed7c99eb5025b.zip | |
configure: Remove miscellaneous program probes
All of these should be handled by rustbuild in sanity.rs right now.
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/configure b/configure index 9c3c3769511..af8b733c7b3 100755 --- a/configure +++ b/configure @@ -821,51 +821,6 @@ if [ $(echo $python_version | grep -c '^Python 2\.7') -ne 1 ]; then err "Found $python_version, but Python 2.7 is required" fi -probe CFG_CLANG clang++ -probe CFG_CCACHE ccache -probe CFG_GCC gcc -probe CFG_LD ld -probe CFG_VALGRIND valgrind -probe CFG_PERF perf -probe CFG_ISCC iscc -probe CFG_ANTLR4 antlr4 -probe CFG_GRUN grun -probe CFG_FLEX flex -probe CFG_BISON bison -probe CFG_GDB gdb -probe CFG_LLDB lldb - -if [ -n "$CFG_ENABLE_NINJA" ] -then - probe CFG_NINJA ninja - if [ -z "$CFG_NINJA" ] - then - # On Debian and Fedora, the `ninja` binary is an IRC bot, so the build tool was - # renamed. Handle this case. - probe CFG_NINJA ninja-build - fi -fi - -# For building LLVM -if [ -z "$CFG_LLVM_ROOT" ] -then - probe_need CFG_CMAKE cmake -fi - -# On MacOS X, invoking `javac` pops up a dialog if the JDK is not -# installed. Since `javac` is only used if `antlr4` is available, -# probe for it only in this case. -if [ -n "$CFG_ANTLR4" ] -then - CFG_ANTLR4_JAR="\"$(find /usr/ -name antlr-complete.jar 2>/dev/null | head -n 1)\"" - if [ "x" = "x$CFG_ANTLR4_JAR" ] - then - CFG_ANTLR4_JAR="\"$(find ~ -name antlr-complete.jar 2>/dev/null | head -n 1)\"" - fi - putvar CFG_ANTLR4_JAR $CFG_ANTLR4_JAR - probe CFG_JAVAC javac -fi - # the valgrind rpass tests will fail if you don't have a valgrind, but they're # only disabled if you opt out. if [ -z "$CFG_VALGRIND" ] @@ -927,10 +882,6 @@ if [ -n "$RUST_DIST_SERVER" -a -n "$ALLOW_NONZERO_RLIMIT_CORE" ]; then fi fi -step_msg "looking for target specific programs" - -probe CFG_ADB adb - BIN_SUF= if [ "$CFG_OSTYPE" = "pc-windows-gnu" ] || [ "$CFG_OSTYPE" = "pc-windows-msvc" ] then |
