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 /tasks/libmruby.rake | |
| parent | cc967ebfb6977c7ff39d5172719da5cebe2b9667 (diff) | |
| parent | dd680b6e67ab3da85e32bb7cf42b5a20822b27bc (diff) | |
| download | mruby-5ef8aa765faf1981d35a47dfb27110d0ad1397e6.tar.gz mruby-5ef8aa765faf1981d35a47dfb27110d0ad1397e6.zip | |
resolve conflict
Diffstat (limited to 'tasks/libmruby.rake')
| -rw-r--r-- | tasks/libmruby.rake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tasks/libmruby.rake b/tasks/libmruby.rake index 6f84937fd..4cfebacaf 100644 --- a/tasks/libmruby.rake +++ b/tasks/libmruby.rake @@ -8,6 +8,9 @@ MRuby.each_target do gem_library_paths = gems.map { |g| g.linker.library_paths } f.puts 'MRUBY_LDFLAGS = "%s"' % linker.all_flags(gem_library_paths, gem_flags).gsub('"', '\\"') + gem_flags_before_libraries = gems.map { |g| g.linker.flags_before_libraries } + f.puts 'MRUBY_LDFLAGS_BEFORE_LIBS = "%s"' % [linker.flags_before_libraries, gem_flags_before_libraries].flatten.join(' ').gsub('"', '\\"') + gem_libraries = gems.map { |g| g.linker.libraries } f.puts 'MRUBY_LIBS = "%s"' % linker.library_flags(gem_libraries).gsub('"', '\\"') end |