diff options
| author | Jorge Aparicio <jorge@japaric.io> | 2018-05-30 08:01:35 +0200 |
|---|---|---|
| committer | Jorge Aparicio <jorge@japaric.io> | 2018-06-03 18:23:01 +0200 |
| commit | 66a7db9a3593b1bc4744239a21520369f0418d3c (patch) | |
| tree | 362dc1094b491474856afaeee00a962a97869315 /src/bootstrap/native.rs | |
| parent | 8e673073f349f9b7cadaf809f8b88a2bfd296769 (diff) | |
| download | rust-66a7db9a3593b1bc4744239a21520369f0418d3c.tar.gz rust-66a7db9a3593b1bc4744239a21520369f0418d3c.zip | |
make a llvm-tools rustup component
Diffstat (limited to 'src/bootstrap/native.rs')
| -rw-r--r-- | src/bootstrap/native.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs index 74083360aca..c3f84378adf 100644 --- a/src/bootstrap/native.rs +++ b/src/bootstrap/native.rs @@ -170,12 +170,12 @@ impl Step for Llvm { // // If we are shipping llvm tools then we statically link them LLVM if (target.contains("linux-gnu") || target.contains("apple-darwin")) && - !builder.config.ship_llvm_tools { + !builder.config.llvm_tools_enabled { cfg.define("LLVM_LINK_LLVM_DYLIB", "ON"); } // For distribution we want the LLVM tools to be *statically* linked to libstdc++ - if builder.config.ship_llvm_tools { + if builder.config.llvm_tools_enabled { cfg.define("CMAKE_EXE_LINKER_FLAGS", "-Wl,-Bsymbolic -static-libstdc++"); } |
