about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2020-09-08 11:32:25 +0200
committerMatthias Krüger <matthias.krueger@famsik.de>2020-09-08 11:32:25 +0200
commit0065e33c24213c538ffd76b0cc771e4668819969 (patch)
tree3508c6ced9e6bbe1b770d2bb9a6a631919fdcefb
parent35fc8359868e65a0970094f648ba87fce634e8c7 (diff)
downloadrust-0065e33c24213c538ffd76b0cc771e4668819969.tar.gz
rust-0065e33c24213c538ffd76b0cc771e4668819969.zip
rustbuild: don't set PYTHON_EXECUTABLE and WITH_POLLY cmake vars since they are no longer supported by llvm
CMake Warning:
  Manually-specified variables were not used by the project:

    PYTHON_EXECUTABLE
    WITH_POLLY
-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