From 3649b31765d94cd0e0f0cdfc1acae60951702b9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=AA=E3=81=A4=E3=81=8D?= Date: Thu, 14 May 2015 10:36:56 -0700 Subject: [PATCH] ENV: Add gcc-5 to compilers support C++11 Closes Homebrew/homebrew#39758. Signed-off-by: Jack Nagel --- Library/Homebrew/extend/ENV/std.rb | 2 +- Library/Homebrew/extend/ENV/super.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/extend/ENV/std.rb b/Library/Homebrew/extend/ENV/std.rb index 773ecc4c9f..8992f8f840 100644 --- a/Library/Homebrew/extend/ENV/std.rb +++ b/Library/Homebrew/extend/ENV/std.rb @@ -275,7 +275,7 @@ module Stdenv if compiler == :clang append 'CXX', '-std=c++11' append 'CXX', '-stdlib=libc++' - elsif compiler =~ /gcc-4\.(8|9)/ + elsif compiler =~ /gcc-(4\.(8|9)|5)/ append 'CXX', '-std=c++11' else raise "The selected compiler doesn't support C++11: #{compiler}" diff --git a/Library/Homebrew/extend/ENV/super.rb b/Library/Homebrew/extend/ENV/super.rb index 603e4c0525..bf2f997c64 100644 --- a/Library/Homebrew/extend/ENV/super.rb +++ b/Library/Homebrew/extend/ENV/super.rb @@ -293,7 +293,7 @@ module Superenv when "clang" append 'HOMEBREW_CCCFG', "x", '' append 'HOMEBREW_CCCFG', "g", '' - when /gcc-4\.(8|9)/ + when /gcc-(4\.(8|9)|5)/ append 'HOMEBREW_CCCFG', "x", '' else raise "The selected compiler doesn't support C++11: #{homebrew_cc}"