diff options
| author | bors <bors@rust-lang.org> | 2021-03-04 15:16:44 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-03-04 15:16:44 +0000 |
| commit | 409920873cf8a95739a55dc5fe5adb05e1b4758e (patch) | |
| tree | 61f0b6eef6363dc987e6c22c7e1d8f521b321a92 /src/bootstrap | |
| parent | ec7f258d543e1ac7d0b94435972331e85da8c509 (diff) | |
| parent | ab03c56ba2df69e5c01d2150a319343543a29ba9 (diff) | |
| download | rust-409920873cf8a95739a55dc5fe5adb05e1b4758e.tar.gz rust-409920873cf8a95739a55dc5fe5adb05e1b4758e.zip | |
Auto merge of #81451 - nikic:llvm-12, r=nagisa
Upgrade to LLVM 12 This implements the necessary adjustments to make rustc work with LLVM 12. I didn't encounter any major issues so far. r? `@cuviper`
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/native.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs index b5a8b694c94..fb5127bac54 100644 --- a/src/bootstrap/native.rs +++ b/src/bootstrap/native.rs @@ -383,6 +383,8 @@ fn configure_cmake( cfg.define("CMAKE_SYSTEM_NAME", "Windows"); } else if target.contains("haiku") { cfg.define("CMAKE_SYSTEM_NAME", "Haiku"); + } else if target.contains("solaris") || target.contains("illumos") { + cfg.define("CMAKE_SYSTEM_NAME", "SunOS"); } // When cross-compiling we should also set CMAKE_SYSTEM_VERSION, but in // that case like CMake we cannot easily determine system version either. |