Merge pull request #13 from mriddle/gcc-xcode-6-3-bug

gcc: Work around broken bootstrap with Xcode 6.3
boxen · Apr 24, 2015 · 11e8f73 · 11e8f73
2 parents 7e6e0c9 + e267b5b
commit 11e8f73
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/files/brews/gcc48.rb b/files/brews/gcc48.rb
@@ -104,6 +104,9 @@ def install
       "--enable-stage1-checking",
       "--enable-checking=release",
       "--enable-lto",
+      # Use 'bootstrap-debug' build configuration to force stripping of object
+      # files prior to comparison during bootstrap (broken by Xcode 6.3).
+      "--with-build-config=bootstrap-debug",
       # A no-op unless --HEAD is built because in head warnings will
       # raise errors. But still a good idea to include.
       "--disable-werror",

diff --git a/spec/classes/gcc_spec.rb b/spec/classes/gcc_spec.rb
@@ -8,7 +8,7 @@
       with_ensure('present')
 
     should contain_package('boxen/brews/gcc48').with({
-      :ensure => '4.8.3-boxen1',
+      :ensure => '4.8.3-boxen2',
       :require => 'Homebrew::Tap[homebrew/versions]'
     })
   end