Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit dee6989

Browse files
authoredMar 17, 2017
Rollup merge of rust-lang#40457 - frewsxcv:frewsxcv-macos, r=steveklabnik
Update usages of 'OSX' (and other old names) to 'macOS'. As of last year with version 'Sierra', the Mac operating system is now called 'macOS'.
2 parents 6971717 + 97a1b6a commit dee6989

File tree

41 files changed

+63
-63
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+63
-63
lines changed
 

‎RELEASES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5056,7 +5056,7 @@ Version 0.1 (2012-01-20)
50565056

50575057
* Compiler works with the following configurations:
50585058
* Linux: x86 and x86_64 hosts and targets
5059-
* MacOS: x86 and x86_64 hosts and targets
5059+
* macOS: x86 and x86_64 hosts and targets
50605060
* Windows: x86 hosts and targets
50615061

50625062
* Cross compilation / multi-target configuration supported.

‎src/bootstrap/bin/rustc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ fn main() {
182182
if env::var("RUSTC_RPATH") == Ok("true".to_string()) {
183183
let rpath = if target.contains("apple") {
184184

185-
// Note that we need to take one extra step on OSX to also pass
185+
// Note that we need to take one extra step on macOS to also pass
186186
// `-Wl,-instal_name,@rpath/...` to get things to work right. To
187187
// do that we pass a weird flag to the compiler to get it to do
188188
// so. Note that this is definitely a hack, and we should likely

0 commit comments

Comments
 (0)