Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Change "Mac OS X" to "macOS"
This is not correct for older systems, where the historical name should
be used. There is code in macports::_log_sysinfo in macports.tcl to
compute the right OS name; this needs to be moved into a separate proc
that can also be used from elsewhere.
  • Loading branch information
ryandesign committed Jun 8, 2018
1 parent 163752f commit daa11a1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/port1.0/portmain.tcl
Expand Up @@ -131,7 +131,7 @@ default os.endian {$os_endian}

set macosx_version_text {}
if {[option os.platform] eq "darwin"} {
set macosx_version_text "(Mac OS X ${macosx_version}) "
set macosx_version_text "(macOS ${macosx_version}) "
}
ui_debug "OS [option os.platform]/[option os.version] ${macosx_version_text}arch [option os.arch]"

Expand Down
4 changes: 2 additions & 2 deletions src/port1.0/portutil.tcl
Expand Up @@ -3257,10 +3257,10 @@ proc _check_xcode_version {} {
ui_warn "You downloaded Xcode from the Mac App Store but didn't install it. Run \"Install Xcode\" in the /Applications folder."
}
} elseif {[vercmp $xcodeversion $min] < 0} {
ui_error "The installed version of Xcode (${xcodeversion}) is too old to use on the installed OS version. Version $rec or later is recommended on Mac OS X ${macosx_version}."
ui_error "The installed version of Xcode (${xcodeversion}) is too old to use on the installed OS version. Version $rec or later is recommended on macOS ${macosx_version}."
return 1
} elseif {[vercmp $xcodeversion $ok] < 0} {
ui_warn "The installed version of Xcode (${xcodeversion}) is known to cause problems. Version $rec or later is recommended on Mac OS X ${macosx_version}."
ui_warn "The installed version of Xcode (${xcodeversion}) is known to cause problems. Version $rec or later is recommended on macOS ${macosx_version}."
}

# Xcode 4.3 and above requires the command-line utilities package to be installed.
Expand Down

0 comments on commit daa11a1

Please sign in to comment.