about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorTyler Mandry <tmandry@gmail.com>2020-09-09 21:02:32 -0700
committerGitHub <noreply@github.com>2020-09-09 21:02:32 -0700
commit9fa079420354c4a416e1dac232dcaa09e4313117 (patch)
treea71196b0ca9fa9188fe33a42009fb6e2bcba84c3 /src
parentfa56cf537ffbb5a1614692422c4f0c728eea037f (diff)
parent0065e33c24213c538ffd76b0cc771e4668819969 (diff)
downloadrust-9fa079420354c4a416e1dac232dcaa09e4313117.tar.gz
rust-9fa079420354c4a416e1dac232dcaa09e4313117.zip
Rollup merge of #76472 - matthiaskrgr:llvm_cmake_vars, r=Mark-Simulacrum
rustbuild: don't set PYTHON_EXECUTABLE and WITH_POLLY cmake vars since they are no longer supported by llvm

This resolves

CMake Warning:
  Manually-specified variables were not used by the project:

    PYTHON_EXECUTABLE
    WITH_POLLY
Diffstat (limited to 'src')
-rw-r--r--src/bootstrap/native.rs5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs
index a0c79e38f9d..6cd850bc0bf 100644
--- a/src/bootstrap/native.rs
+++ b/src/bootstrap/native.rs
@@ -169,7 +169,6 @@ impl Step for Llvm {
             .define("LLVM_INCLUDE_TESTS", "OFF")
             .define("LLVM_INCLUDE_DOCS", "OFF")
             .define("LLVM_INCLUDE_BENCHMARKS", "OFF")
-            .define("WITH_POLLY", "OFF")
             .define("LLVM_ENABLE_TERMINFO", "OFF")
             .define("LLVM_ENABLE_LIBEDIT", "OFF")
             .define("LLVM_ENABLE_BINDINGS", "OFF")
@@ -305,10 +304,6 @@ impl Step for Llvm {
             cfg.define("LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN", "YES");
         }
 
-        if let Some(ref python) = builder.config.python {
-            cfg.define("PYTHON_EXECUTABLE", python);
-        }
-
         configure_cmake(builder, target, &mut cfg, true);
 
         // FIXME: we don't actually need to build all LLVM tools and all LLVM