From 0c81a54253bd3d434cc4cd7104e565a389f32df5 Mon Sep 17 00:00:00 2001 From: Joe Kutner Date: Tue, 9 Feb 2016 15:32:44 -0600 Subject: [PATCH] Removed free-bsd --- build_config.rb | 29 ----------------------------- extconf.rb | 2 -- mjruby.gemspec | 2 -- 3 files changed, 33 deletions(-) diff --git a/build_config.rb b/build_config.rb index 6a0c0c3..e9d1569 100644 --- a/build_config.rb +++ b/build_config.rb @@ -107,32 +107,3 @@ def gem_config(conf) gem_config(conf) end - -MRuby::CrossBuild.new('x86_64-pc-freebsd7') do |conf| - toolchain :gcc - - [conf.cc, conf.cxx, conf.linker].each do |cc| - cc.flags << "-Wl,--no-as-needed" - cc.flags << "-ldl" - end - - conf.build_target = 'x86_64-pc-linux-gnu' - conf.host_target = 'x86_64-pc-freebsd7' - - gem_config(conf) -end - -MRuby::CrossBuild.new('i686-pc-freebsd7') do |conf| - toolchain :gcc - - [conf.cc, conf.cxx, conf.linker].each do |cc| - cc.flags << "-m32" - cc.flags << "-Wl,--no-as-needed" - cc.flags << "-ldl" - end - - conf.build_target = 'i686-pc-linux-gnu' - conf.host_target = 'i686-pc-freebsd7' - - gem_config(conf) -end diff --git a/extconf.rb b/extconf.rb index 2158e93..17de03f 100644 --- a/extconf.rb +++ b/extconf.rb @@ -27,8 +27,6 @@ when /^i\d86-Mac OS X/ then "mruby/build/x86_64-apple-darwin14/bin/mjruby" when /^x86-Windows/ then "mruby/build/i686-w64-mingw32/bin/mjruby.exe" when /^(amd64|x86_64)-Windows/ then "mruby/build/x86_64-w64-mingw32/bin/mjruby.exe" - when /^x86-FreeBSD/ then "mruby/build/i686-pc-freebsd7/bin/mjruby" - when /^(amd64|x86_64)-FreeBSD/ then "mruby/build/x86_64-pc-freebsd7/bin/mjruby" else nil raise "Could not find appropriate architecture for '#{arch}'" end diff --git a/mjruby.gemspec b/mjruby.gemspec index 6296054..0028f5b 100644 --- a/mjruby.gemspec +++ b/mjruby.gemspec @@ -17,8 +17,6 @@ Gem::Specification.new do |spec| "x86_64-apple-darwin14", "i686-pc-linux-gnu", "x86_64-pc-linux-gnu", - "i686-pc-freebsd7", - "x86_64-pc-freebsd7", ].map {|p| "#{p}/bin/mjruby"} + ["i686-w64-mingw32", "x86_64-w64-mingw32"