diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-04-17 10:31:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-17 10:31:36 +0200 |
| commit | 23e8aaf4719972884ca825165a0de3ac8a2aaf9e (patch) | |
| tree | 95b954e808053a3fef38193e578c30279765ed76 /src/bootstrap | |
| parent | 3049f05ca159c06f62601f25b5ebe228bdeebd0c (diff) | |
| parent | eb8e4265abdf21ab76a8e33e372efe41a5204fb4 (diff) | |
| download | rust-23e8aaf4719972884ca825165a0de3ac8a2aaf9e.tar.gz rust-23e8aaf4719972884ca825165a0de3ac8a2aaf9e.zip | |
Rollup merge of #60003 - petrhosek:llvm-lto-lld, r=cramertj
LLD is not supported on Darwin Don't enable LLD when LTO is enabled on Darwin.
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/native.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs index fde40b0d1b4..96aed729345 100644 --- a/src/bootstrap/native.rs +++ b/src/bootstrap/native.rs @@ -156,8 +156,10 @@ impl Step for Llvm { .define("LLVM_DEFAULT_TARGET_TRIPLE", target); if builder.config.llvm_thin_lto && !emscripten { - cfg.define("LLVM_ENABLE_LTO", "Thin") - .define("LLVM_ENABLE_LLD", "ON"); + cfg.define("LLVM_ENABLE_LTO", "Thin"); + if !target.contains("apple") { + cfg.define("LLVM_ENABLE_LLD", "ON"); + } } // By default, LLVM will automatically find OCaml and, if it finds it, |