build_config/no-float.rb: unify two build configurations; #5421

- stop cross building
- add more gems for tests
- add `bintest`

2 files changed, 13 insertions, 28 deletions

diff --git a/build_config/no-float.rb b/build_config/no-float.rb
index e0738cac4..977bf4e12 100644
--- a/build_config/no-float.rb
+++ b/build_config/no-float.rb
@@ -1,17 +1,22 @@
-# Define cross build settings
-MRuby::CrossBuild.new('no-float') do |conf|
-  conf.toolchain
+MRuby::Build.new do |conf|
+  # load specific toolchain settings
+  toolchain :gcc
+
+  # include the GEM box
+  conf.gembox "stdlib"
+  conf.gembox "stdlib-ext"
+  conf.gembox "stdlib-io"
+  conf.gembox "metaprog"
+
+  conf.gem :core => 'mruby-bin-mruby'
+  conf.gem :core => 'mruby-bin-mirb'
 
   # Add configuration
   conf.compilers.each do |c|
     c.defines << "MRB_NO_FLOAT"
   end
 
-  conf.gem :core => "mruby-bin-mruby"
-
-  conf.test_runner.command = 'env'
-
   conf.enable_debug
-#  conf.enable_bintest
   conf.enable_test
+  conf.enable_bintest
 end
diff --git a/build_config/nofloat.rb b/build_config/nofloat.rb
deleted file mode 100644
index 7043e4e2c..000000000
--- a/build_config/nofloat.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-MRuby::Build.new do |conf|
-  # load specific toolchain settings
-  toolchain :gcc
-
-  # include the GEM box
-  conf.gembox "stdlib"
-  conf.gembox "stdlib-ext"
-  conf.gembox "stdlib-io"
-  conf.gembox "metaprog"
-
-  conf.gem :core => 'mruby-bin-mruby'
-  conf.gem :core => 'mruby-bin-mirb'
-
-  conf.cc.defines << 'MRB_NO_FLOAT'
-
-  # Turn on `enable_debug` for better debugging
-  conf.enable_debug
-  conf.enable_test
-  conf.enable_bintest
-end