diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2020-12-05 14:08:29 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-12-05 14:08:29 +0900 |
| commit | 63d82142a8d3915d977fd97fc2ee82b5951065ed (patch) | |
| tree | c501616276d35505525aa3532361552d3ed84c3b /tasks | |
| parent | 00d1fd0e6fee6cef2565c4a3b2dd428b0d59f4bf (diff) | |
| parent | 73b4152574f0dd6747488662751f59f8c4c0b50d (diff) | |
| download | mruby-63d82142a8d3915d977fd97fc2ee82b5951065ed.tar.gz mruby-63d82142a8d3915d977fd97fc2ee82b5951065ed.zip | |
Merge pull request #5212 from shuujii/make-it-possible-that-libmruby.a-is-not-created
Make it possible that `libmruby.a` is not created
Diffstat (limited to 'tasks')
| -rw-r--r-- | tasks/core.rake | 6 | ||||
| -rw-r--r-- | tasks/libmruby.rake | 6 | ||||
| -rw-r--r-- | tasks/mrblib.rake | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/tasks/core.rake b/tasks/core.rake index c4816d4ce..aca5faed8 100644 --- a/tasks/core.rake +++ b/tasks/core.rake @@ -9,9 +9,5 @@ MRuby.each_target do objfile(dst) end end - self.libmruby_objs << objs - - file libmruby_core_static => objs do |t| - archiver.run t.name, t.prerequisites - end + self.libmruby_core_objs << objs end diff --git a/tasks/libmruby.rake b/tasks/libmruby.rake index e302ca02b..c73b25d3b 100644 --- a/tasks/libmruby.rake +++ b/tasks/libmruby.rake @@ -1,4 +1,10 @@ MRuby.each_target do + file libmruby_core_static => libmruby_core_objs.flatten do |t| + archiver.run t.name, t.prerequisites + end + + next unless libmruby_enabled? + file libmruby_static => libmruby_objs.flatten do |t| archiver.run t.name, t.prerequisites end diff --git a/tasks/mrblib.rake b/tasks/mrblib.rake index 7231b63bc..a7f592593 100644 --- a/tasks/mrblib.rake +++ b/tasks/mrblib.rake @@ -1,4 +1,6 @@ MRuby.each_target do + next unless libmruby_enabled? + src = "#{build_dir}/mrblib/mrblib.c" obj = objfile(src.ext) rbfiles = Dir["#{MRUBY_ROOT}/mrblib/*.rb"].sort! |