diff options
| author | Yukihiro Matz Matsumoto <[email protected]> | 2013-01-24 16:48:38 +0900 |
|---|---|---|
| committer | Yukihiro Matz Matsumoto <[email protected]> | 2013-01-24 16:48:38 +0900 |
| commit | 5ef8aa765faf1981d35a47dfb27110d0ad1397e6 (patch) | |
| tree | a5714e57b10dec9c3e9e2c4f2ced40f86904e77d /tools | |
| parent | cc967ebfb6977c7ff39d5172719da5cebe2b9667 (diff) | |
| parent | dd680b6e67ab3da85e32bb7cf42b5a20822b27bc (diff) | |
| download | mruby-5ef8aa765faf1981d35a47dfb27110d0ad1397e6.tar.gz mruby-5ef8aa765faf1981d35a47dfb27110d0ad1397e6.zip | |
resolve conflict
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/mirb/mirb.rake | 4 | ||||
| -rw-r--r-- | tools/mruby/mruby.rake | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/tools/mirb/mirb.rake b/tools/mirb/mirb.rake index 0c340a2f5..46e69136e 100644 --- a/tools/mirb/mirb.rake +++ b/tools/mirb/mirb.rake @@ -7,9 +7,11 @@ MRuby.each_target do file exec => objs + [libfile("#{build_dir}/lib/libmruby")] do |t| gem_flags = gems.map { |g| g.linker.flags } + gem_flags_before_libraries = gems.map { |g| g.linker.flags_before_libraries } + gem_flags_after_libraries = gems.map { |g| g.linker.flags_after_libraries } gem_libraries = gems.map { |g| g.linker.libraries } gem_library_paths = gems.map { |g| g.linker.library_paths } - linker.run t.name, t.prerequisites, gem_libraries, gem_library_paths, gem_flags + linker.run t.name, t.prerequisites, gem_libraries, gem_library_paths, gem_flags, gem_flags_before_libraries end end end diff --git a/tools/mruby/mruby.rake b/tools/mruby/mruby.rake index df31b0343..fccebff63 100644 --- a/tools/mruby/mruby.rake +++ b/tools/mruby/mruby.rake @@ -7,9 +7,11 @@ MRuby.each_target do file exec => objs + [libfile("#{build_dir}/lib/libmruby")] do |t| gem_flags = gems.map { |g| g.linker.flags } + gem_flags_before_libraries = gems.map { |g| g.linker.flags_before_libraries } + gem_flags_after_libraries = gems.map { |g| g.linker.flags_after_libraries } gem_libraries = gems.map { |g| g.linker.libraries } gem_library_paths = gems.map { |g| g.linker.library_paths } - linker.run t.name, t.prerequisites, gem_libraries, gem_library_paths, gem_flags + linker.run t.name, t.prerequisites, gem_libraries, gem_library_paths, gem_flags, gem_flags_before_libraries end end end |