From b37b31208152fdee0cb99e00cffec0b9e57040c6 Mon Sep 17 00:00:00 2001
From: take-cheeze <takechi101010@gmail.com>
Date: Mon, 29 Oct 2018 13:56:20 +0900
Subject: Rename libmruby stuff to avoid confusion

---
 src/mruby_core.rake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mruby_core.rake')

diff --git a/src/mruby_core.rake b/src/mruby_core.rake
index bb3d7b633..3024c8544 100644
--- a/src/mruby_core.rake
+++ b/src/mruby_core.rake
@@ -12,9 +12,9 @@ MRuby.each_target do
   if cxx_exception_enabled?
     objs += %w(vm error).map { |v| compile_as_cxx "#{current_dir}/#{v}.c", "#{current_build_dir}/#{v}.cxx" }
   end
-  self.libmruby << objs
+  self.libmruby_objs << objs
 
-  file libfile("#{build_dir}/lib/libmruby_core") => objs do |t|
+  file libmruby_core_static => objs do |t|
     archiver.run t.name, t.prerequisites
   end
 end
-- 
cgit v1.2.3


From 366a14f297a6b31301b8e01f5ef21ad8fe184977 Mon Sep 17 00:00:00 2001
From: KOBAYASHI Shuji <shuujii@gmail.com>
Date: Wed, 16 Jan 2019 23:48:59 +0900
Subject: Remove special treatments for `MRB_WITHOUT_FLOAT` in build scripts

---
 mrbgems/mruby-test/mrbgem.rake | 4 ----
 src/mruby_core.rake            | 1 -
 2 files changed, 5 deletions(-)

(limited to 'src/mruby_core.rake')

diff --git a/mrbgems/mruby-test/mrbgem.rake b/mrbgems/mruby-test/mrbgem.rake
index 6f94da92d..61bdf9ced 100644
--- a/mrbgems/mruby-test/mrbgem.rake
+++ b/mrbgems/mruby-test/mrbgem.rake
@@ -7,10 +7,6 @@ MRuby::Gem::Specification.new('mruby-test') do |spec|
   spec.add_dependency('mruby-compiler', :core => 'mruby-compiler')
 
   spec.test_rbfiles = Dir.glob("#{MRUBY_ROOT}/test/t/*.rb")
-  if build.cc.defines.flatten.include?("MRB_WITHOUT_FLOAT")
-    spec.test_rbfiles.delete("#{MRUBY_ROOT}/test/t/float.rb")
-  end
-
 
   clib = "#{build_dir}/mrbtest.c"
   mlib = clib.ext(exts.object)
diff --git a/src/mruby_core.rake b/src/mruby_core.rake
index 3024c8544..73fddb220 100644
--- a/src/mruby_core.rake
+++ b/src/mruby_core.rake
@@ -5,7 +5,6 @@ MRuby.each_target do
 
   objs = Dir.glob("#{current_dir}/*.c").map { |f|
     next nil if cxx_exception_enabled? and f =~ /(error|vm).c$/
-    next nil if self.cc.defines.flatten.include?("MRB_WITHOUT_FLOAT") and f =~ /fmt_fp.c$/
     objfile(f.pathmap("#{current_build_dir}/%n"))
   }.compact
 
-- 
cgit v1.2.3