From d30b1186311a72e4c5abe7404e0cd0651a1cc914 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Tue, 15 Apr 2014 13:18:18 +0100 Subject: [PATCH] Migrate apple-gcc42 back to homebrew/versions. Closes Homebrew/homebrew#28418. --- Library/Homebrew/cmd/tap.rb | 5 +---- Library/Homebrew/tap_migrations.rb | 1 + 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/cmd/tap.rb b/Library/Homebrew/cmd/tap.rb index f7dbea3226..4b00c21b62 100644 --- a/Library/Homebrew/cmd/tap.rb +++ b/Library/Homebrew/cmd/tap.rb @@ -63,10 +63,7 @@ module Homebrew extend self tapped += 1 else to = to.realpath if to.exist? - # Whitelist gcc42 temporarily until Mavericks/Xcode 5.0 issues are resolved. - unless to.tap_ref == 'Homebrew/homebrew/apple-gcc42' - opoo "Could not tap #{Tty.white}#{from.tap_ref}#{Tty.reset} over #{Tty.white}#{to.tap_ref}#{Tty.reset}" - end + opoo "Could not tap #{Tty.white}#{from.tap_ref}#{Tty.reset} over #{Tty.white}#{to.tap_ref}#{Tty.reset}" end end end diff --git a/Library/Homebrew/tap_migrations.rb b/Library/Homebrew/tap_migrations.rb index c2c0d856a2..bd4bc5d810 100644 --- a/Library/Homebrew/tap_migrations.rb +++ b/Library/Homebrew/tap_migrations.rb @@ -1,5 +1,6 @@ TAP_MIGRATIONS = { "aimage" => "homebrew/boneyard", + "apple-gcc42" => "homebrew/versions", "blackbox" => "homebrew/boneyard", "boost149" => "homebrew/versions", "cmucl" => "homebrew/binary",