diff options
| author | Patrick Mooney <pmooney@oxide.computer> | 2020-04-13 23:37:22 +0000 |
|---|---|---|
| committer | Patrick Mooney <pmooney@oxide.computer> | 2020-04-14 20:36:07 +0000 |
| commit | b77aefb76ebb9e73cf5a26885c131674495f434d (patch) | |
| tree | f7feb6eb191a95f958b548d4a946537c7cc9c54a /src/librustc_codegen_ssa | |
| parent | edc02580e4e80476ac1ded2cc1008eaf8b8400e6 (diff) | |
| download | rust-b77aefb76ebb9e73cf5a26885c131674495f434d.tar.gz rust-b77aefb76ebb9e73cf5a26885c131674495f434d.zip | |
Add illumos triple
Co-Authored-By: Jason King <jason.brian.king@gmail.com> Co-Authored-By: Joshua M. Clulow <jmc@oxide.computer>
Diffstat (limited to 'src/librustc_codegen_ssa')
| -rw-r--r-- | src/librustc_codegen_ssa/Cargo.toml | 2 | ||||
| -rw-r--r-- | src/librustc_codegen_ssa/back/link.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_codegen_ssa/Cargo.toml b/src/librustc_codegen_ssa/Cargo.toml index 717e32d4a0d..d9620a21d37 100644 --- a/src/librustc_codegen_ssa/Cargo.toml +++ b/src/librustc_codegen_ssa/Cargo.toml @@ -15,7 +15,7 @@ cc = "1.0.1" num_cpus = "1.0" memmap = "0.7" log = "0.4.5" -libc = "0.2.44" +libc = "0.2.50" jobserver = "0.1.11" tempfile = "3.1" diff --git a/src/librustc_codegen_ssa/back/link.rs b/src/librustc_codegen_ssa/back/link.rs index 20e64f0c488..0e45652f951 100644 --- a/src/librustc_codegen_ssa/back/link.rs +++ b/src/librustc_codegen_ssa/back/link.rs @@ -759,7 +759,7 @@ fn linker_and_flavor(sess: &Session) -> (PathBuf, LinkerFlavor) { } } LinkerFlavor::Gcc => { - if cfg!(target_os = "solaris") { + if cfg!(any(target_os = "solaris", target_os = "illumos")) { // On historical Solaris systems, "cc" may have // been Sun Studio, which is not flag-compatible // with "gcc". This history casts a long shadow, |