gcc@4.9: remove java option
This commit is contained in:
parent
ac2050f536
commit
9773f9c300
1 changed files with 1 additions and 25 deletions
|
@ -32,19 +32,12 @@ class GccAT49 < Formula
|
|||
sha256 "1c407f31d58ab8e41230a83c6ffd1d77503c0c6528ccbc182f6888c23c5fb972" => :el_capitan
|
||||
end
|
||||
|
||||
option "without-fortran", "Build without the gfortran compiler"
|
||||
option "with-java", "Build the gcj compiler"
|
||||
option "with-all-languages", "Enable all compilers and languages, except Ada"
|
||||
option "with-nls", "Build with native language support (localization)"
|
||||
option "with-profiled-build", "Make use of profile guided optimization when bootstrapping GCC"
|
||||
|
||||
deprecated_option "enable-java" => "with-java"
|
||||
deprecated_option "enable-all-languages" => "with-all-languages"
|
||||
deprecated_option "enable-nls" => "with-nls"
|
||||
deprecated_option "enable-profiled-build" => "with-profiled-build"
|
||||
|
||||
depends_on "ecj" if build.with?("java") || build.with?("all-languages")
|
||||
|
||||
resource "gmp" do
|
||||
url "https://ftp.gnu.org/gnu/gmp/gmp-4.3.2.tar.bz2"
|
||||
mirror "https://ftpmirror.gnu.org/gmp/gmp-4.3.2.tar.bz2"
|
||||
|
@ -114,26 +107,13 @@ class GccAT49 < Formula
|
|||
# Build dependencies in-tree, to avoid having versioned formulas
|
||||
resources.each { |r| r.stage(buildpath/r.name) }
|
||||
|
||||
if build.with? "all-languages"
|
||||
# Everything but Ada, which requires a pre-existing GCC Ada compiler
|
||||
# (gnat) to bootstrap. GCC 4.6.0 add go as a language option, but it is
|
||||
# currently only compilable on Linux.
|
||||
languages = %w[c c++ fortran java objc obj-c++]
|
||||
else
|
||||
# C, C++, ObjC compilers are always built
|
||||
languages = %w[c c++ objc obj-c++]
|
||||
|
||||
languages << "fortran" if build.with? "fortran"
|
||||
languages << "java" if build.with? "java"
|
||||
end
|
||||
|
||||
version_suffix = version.to_s.slice(/\d\.\d/)
|
||||
|
||||
args = [
|
||||
"--build=#{arch}-apple-darwin#{osmajor}",
|
||||
"--prefix=#{prefix}",
|
||||
"--libdir=#{lib}/gcc/#{version_suffix}",
|
||||
"--enable-languages=#{languages.join(",")}",
|
||||
"--enable-languages=c,c++,fortran,objc,obj-c++",
|
||||
# Make most executables versioned to avoid conflicts.
|
||||
"--program-suffix=-#{version_suffix}",
|
||||
"--with-system-zlib",
|
||||
|
@ -157,10 +137,6 @@ class GccAT49 < Formula
|
|||
|
||||
args << "--disable-nls" if build.without? "nls"
|
||||
|
||||
if build.with?("java") || build.with?("all-languages")
|
||||
args << "--with-ecj-jar=#{Formula["ecj"].opt_prefix}/share/java/ecj.jar"
|
||||
end
|
||||
|
||||
if MacOS.prefer_64_bit?
|
||||
args << "--enable-multilib"
|
||||
else
|
||||
|
|
Loading…
Reference in a new issue