diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-02-10 08:43:20 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-02-10 08:43:20 -0800 |
| commit | 08cbb4a5af25bc39bb49bc328dd4a4ff5ba231ee (patch) | |
| tree | ae7793f978d21bf79d5a3b9e6622665d54d9e9b8 | |
| parent | df55acf1d055027ce834fe8c228669c37903a77f (diff) | |
| parent | 6e8b8733c98fb2333224c5cfc7ffcf57fa878d98 (diff) | |
| download | rust-08cbb4a5af25bc39bb49bc328dd4a4ff5ba231ee.tar.gz rust-08cbb4a5af25bc39bb49bc328dd4a4ff5ba231ee.zip | |
rollup merge of #22147: dotdash/llvm_version
When trying to build against a newer, local LLVM version it might be preferable to have a flag to disable the LLVM version check instead of having to modify the configure script. Fixes #21998 r? @alexcrichton
| -rwxr-xr-x | configure | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/configure b/configure index a80dafcf047..e6b8d235448 100755 --- a/configure +++ b/configure @@ -525,6 +525,7 @@ opt verify-install 1 "verify installed binaries work" opt dist-host-only 0 "only install bins for the host architecture" opt inject-std-version 1 "inject the current compiler version of libstd into programs" opt jemalloc 1 "build liballoc with jemalloc" +opt llvm-version-check 1 "don't check if the LLVM version is supported, build anyway" valopt localstatedir "/var/lib" "local state directory" valopt sysconfdir "/etc" "install system configuration files" @@ -796,7 +797,7 @@ then putvar CFG_ENABLE_CLANG fi -if [ ! -z "$CFG_LLVM_ROOT" -a -e "$CFG_LLVM_ROOT/bin/llvm-config" ] +if [ ! -z "$CFG_LLVM_ROOT" -a -z "$CFG_DISABLE_LLVM_VERSION_CHECK" -a -e "$CFG_LLVM_ROOT/bin/llvm-config" ] then step_msg "using custom LLVM at $CFG_LLVM_ROOT" |