diff options
Diffstat (limited to 'Library/Homebrew/os')
| -rw-r--r-- | Library/Homebrew/os/mac.rb | 88 | ||||
| -rw-r--r-- | Library/Homebrew/os/mac/cctools_mach.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/os/mac/ruby_keg.rb | 4 | ||||
| -rw-r--r-- | Library/Homebrew/os/mac/ruby_mach.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/os/mac/version.rb | 18 |
5 files changed, 57 insertions, 57 deletions
diff --git a/Library/Homebrew/os/mac.rb b/Library/Homebrew/os/mac.rb index ad8d474b8..803d8cce3 100644 --- a/Library/Homebrew/os/mac.rb +++ b/Library/Homebrew/os/mac.rb @@ -156,50 +156,50 @@ module OS end STANDARD_COMPILERS = { - "2.0" => { :gcc_40_build => 4061 }, - "2.5" => { :gcc_40_build => 5370 }, - "3.1.4" => { :gcc_40_build => 5493, :gcc_42_build => 5577 }, - "3.2.6" => { :gcc_40_build => 5494, :gcc_42_build => 5666, :clang => "1.7", :clang_build => 77 }, - "4.0" => { :gcc_40_build => 5494, :gcc_42_build => 5666, :clang => "2.0", :clang_build => 137 }, - "4.0.1" => { :gcc_40_build => 5494, :gcc_42_build => 5666, :clang => "2.0", :clang_build => 137 }, - "4.0.2" => { :gcc_40_build => 5494, :gcc_42_build => 5666, :clang => "2.0", :clang_build => 137 }, - "4.2" => { :clang => "3.0", :clang_build => 211 }, - "4.3" => { :clang => "3.1", :clang_build => 318 }, - "4.3.1" => { :clang => "3.1", :clang_build => 318 }, - "4.3.2" => { :clang => "3.1", :clang_build => 318 }, - "4.3.3" => { :clang => "3.1", :clang_build => 318 }, - "4.4" => { :clang => "4.0", :clang_build => 421 }, - "4.4.1" => { :clang => "4.0", :clang_build => 421 }, - "4.5" => { :clang => "4.1", :clang_build => 421 }, - "4.5.1" => { :clang => "4.1", :clang_build => 421 }, - "4.5.2" => { :clang => "4.1", :clang_build => 421 }, - "4.6" => { :clang => "4.2", :clang_build => 425 }, - "4.6.1" => { :clang => "4.2", :clang_build => 425 }, - "4.6.2" => { :clang => "4.2", :clang_build => 425 }, - "4.6.3" => { :clang => "4.2", :clang_build => 425 }, - "5.0" => { :clang => "5.0", :clang_build => 500 }, - "5.0.1" => { :clang => "5.0", :clang_build => 500 }, - "5.0.2" => { :clang => "5.0", :clang_build => 500 }, - "5.1" => { :clang => "5.1", :clang_build => 503 }, - "5.1.1" => { :clang => "5.1", :clang_build => 503 }, - "6.0" => { :clang => "6.0", :clang_build => 600 }, - "6.0.1" => { :clang => "6.0", :clang_build => 600 }, - "6.1" => { :clang => "6.0", :clang_build => 600 }, - "6.1.1" => { :clang => "6.0", :clang_build => 600 }, - "6.2" => { :clang => "6.0", :clang_build => 600 }, - "6.3" => { :clang => "6.1", :clang_build => 602 }, - "6.3.1" => { :clang => "6.1", :clang_build => 602 }, - "6.3.2" => { :clang => "6.1", :clang_build => 602 }, - "6.4" => { :clang => "6.1", :clang_build => 602 }, - "7.0" => { :clang => "7.0", :clang_build => 700 }, - "7.0.1" => { :clang => "7.0", :clang_build => 700 }, - "7.1" => { :clang => "7.0", :clang_build => 700 }, - "7.1.1" => { :clang => "7.0", :clang_build => 700 }, - "7.2" => { :clang => "7.0", :clang_build => 700 }, - "7.2.1" => { :clang => "7.0", :clang_build => 700 }, - "7.3" => { :clang => "7.3", :clang_build => 703 }, - "7.3.1" => { :clang => "7.3", :clang_build => 703 }, - "8.0" => { :clang => "8.0", :clang_build => 800 }, + "2.0" => { gcc_40_build: 4061 }, + "2.5" => { gcc_40_build: 5370 }, + "3.1.4" => { gcc_40_build: 5493, gcc_42_build: 5577 }, + "3.2.6" => { gcc_40_build: 5494, gcc_42_build: 5666, clang: "1.7", clang_build: 77 }, + "4.0" => { gcc_40_build: 5494, gcc_42_build: 5666, clang: "2.0", clang_build: 137 }, + "4.0.1" => { gcc_40_build: 5494, gcc_42_build: 5666, clang: "2.0", clang_build: 137 }, + "4.0.2" => { gcc_40_build: 5494, gcc_42_build: 5666, clang: "2.0", clang_build: 137 }, + "4.2" => { clang: "3.0", clang_build: 211 }, + "4.3" => { clang: "3.1", clang_build: 318 }, + "4.3.1" => { clang: "3.1", clang_build: 318 }, + "4.3.2" => { clang: "3.1", clang_build: 318 }, + "4.3.3" => { clang: "3.1", clang_build: 318 }, + "4.4" => { clang: "4.0", clang_build: 421 }, + "4.4.1" => { clang: "4.0", clang_build: 421 }, + "4.5" => { clang: "4.1", clang_build: 421 }, + "4.5.1" => { clang: "4.1", clang_build: 421 }, + "4.5.2" => { clang: "4.1", clang_build: 421 }, + "4.6" => { clang: "4.2", clang_build: 425 }, + "4.6.1" => { clang: "4.2", clang_build: 425 }, + "4.6.2" => { clang: "4.2", clang_build: 425 }, + "4.6.3" => { clang: "4.2", clang_build: 425 }, + "5.0" => { clang: "5.0", clang_build: 500 }, + "5.0.1" => { clang: "5.0", clang_build: 500 }, + "5.0.2" => { clang: "5.0", clang_build: 500 }, + "5.1" => { clang: "5.1", clang_build: 503 }, + "5.1.1" => { clang: "5.1", clang_build: 503 }, + "6.0" => { clang: "6.0", clang_build: 600 }, + "6.0.1" => { clang: "6.0", clang_build: 600 }, + "6.1" => { clang: "6.0", clang_build: 600 }, + "6.1.1" => { clang: "6.0", clang_build: 600 }, + "6.2" => { clang: "6.0", clang_build: 600 }, + "6.3" => { clang: "6.1", clang_build: 602 }, + "6.3.1" => { clang: "6.1", clang_build: 602 }, + "6.3.2" => { clang: "6.1", clang_build: 602 }, + "6.4" => { clang: "6.1", clang_build: 602 }, + "7.0" => { clang: "7.0", clang_build: 700 }, + "7.0.1" => { clang: "7.0", clang_build: 700 }, + "7.1" => { clang: "7.0", clang_build: 700 }, + "7.1.1" => { clang: "7.0", clang_build: 700 }, + "7.2" => { clang: "7.0", clang_build: 700 }, + "7.2.1" => { clang: "7.0", clang_build: 700 }, + "7.3" => { clang: "7.3", clang_build: 703 }, + "7.3.1" => { clang: "7.3", clang_build: 703 }, + "8.0" => { clang: "8.0", clang_build: 800 }, }.freeze def compilers_standard? diff --git a/Library/Homebrew/os/mac/cctools_mach.rb b/Library/Homebrew/os/mac/cctools_mach.rb index 7e8f9a4d3..7e8b96b83 100644 --- a/Library/Homebrew/os/mac/cctools_mach.rb +++ b/Library/Homebrew/os/mac/cctools_mach.rb @@ -44,7 +44,7 @@ module CctoolsMachO else :dunno end - mach_data << { :arch => arch, :type => type } + mach_data << { arch: arch, type: type } end mach_data rescue diff --git a/Library/Homebrew/os/mac/ruby_keg.rb b/Library/Homebrew/os/mac/ruby_keg.rb index 8f7b37419..e476b174f 100644 --- a/Library/Homebrew/os/mac/ruby_keg.rb +++ b/Library/Homebrew/os/mac/ruby_keg.rb @@ -4,7 +4,7 @@ module RubyKeg def change_dylib_id(id, file) @require_install_name_tool = true puts "Changing dylib ID of #{file}\n from #{file.dylib_id}\n to #{id}" if ARGV.debug? - MachO::Tools.change_dylib_id(file, id, :strict => false) + MachO::Tools.change_dylib_id(file, id, strict: false) rescue MachO::MachOError onoe <<-EOS.undent Failed changing dylib ID of #{file} @@ -17,7 +17,7 @@ module RubyKeg def change_install_name(old, new, file) @require_install_name_tool = true puts "Changing install name in #{file}\n from #{old}\n to #{new}" if ARGV.debug? - MachO::Tools.change_install_name(file, old, new, :strict => false) + MachO::Tools.change_install_name(file, old, new, strict: false) rescue MachO::MachOError onoe <<-EOS.undent Failed changing install name in #{file} diff --git a/Library/Homebrew/os/mac/ruby_mach.rb b/Library/Homebrew/os/mac/ruby_mach.rb index 0a1565f4f..5d0e75c31 100644 --- a/Library/Homebrew/os/mac/ruby_mach.rb +++ b/Library/Homebrew/os/mac/ruby_mach.rb @@ -33,7 +33,7 @@ module RubyMachO else :dunno end - mach_data << { :arch => arch, :type => type } + mach_data << { arch: arch, type: type } end mach_data diff --git a/Library/Homebrew/os/mac/version.rb b/Library/Homebrew/os/mac/version.rb index 8d96bd3b9..802ec3035 100644 --- a/Library/Homebrew/os/mac/version.rb +++ b/Library/Homebrew/os/mac/version.rb @@ -4,15 +4,15 @@ module OS module Mac class Version < ::Version SYMBOLS = { - :sierra => "10.12", - :el_capitan => "10.11", - :yosemite => "10.10", - :mavericks => "10.9", - :mountain_lion => "10.8", - :lion => "10.7", - :snow_leopard => "10.6", - :leopard => "10.5", - :tiger => "10.4", + sierra: "10.12", + el_capitan: "10.11", + yosemite: "10.10", + mavericks: "10.9", + mountain_lion: "10.8", + lion: "10.7", + snow_leopard: "10.6", + leopard: "10.5", + tiger: "10.4", }.freeze def self.from_symbol(sym) |
