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/toolchains | |
| parent | cc967ebfb6977c7ff39d5172719da5cebe2b9667 (diff) | |
| parent | dd680b6e67ab3da85e32bb7cf42b5a20822b27bc (diff) | |
| download | mruby-5ef8aa765faf1981d35a47dfb27110d0ad1397e6.tar.gz mruby-5ef8aa765faf1981d35a47dfb27110d0ad1397e6.zip | |
resolve conflict
Diffstat (limited to 'tasks/toolchains')
| -rw-r--r-- | tasks/toolchains/gcc.rake | 2 | ||||
| -rw-r--r-- | tasks/toolchains/vs2012.rake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tasks/toolchains/gcc.rake b/tasks/toolchains/gcc.rake index 54fd3ecd8..2c160683d 100644 --- a/tasks/toolchains/gcc.rake +++ b/tasks/toolchains/gcc.rake @@ -16,6 +16,6 @@ MRuby::Toolchain.new(:gcc) do |conf| linker.library_paths = [] linker.option_library = '-l%s' linker.option_library_path = '-L%s' - linker.link_options = '%{flags} -o %{outfile} %{objs} %{libs}' + linker.link_options = '%{flags} -o %{outfile} %{objs} %{flags_before_libraries} %{libs} %{flags_after_libraries}' end end diff --git a/tasks/toolchains/vs2012.rake b/tasks/toolchains/vs2012.rake index b5d2298c2..e3b80b98b 100644 --- a/tasks/toolchains/vs2012.rake +++ b/tasks/toolchains/vs2012.rake @@ -16,7 +16,7 @@ MRuby::Toolchain.new(:vs2012) do |conf| linker.library_paths = %w() linker.option_library = '%s' linker.option_library_path = '/LIBPATH:%s' - linker.link_options = "%{flags} /OUT:%{outfile} %{objs} %{libs}" + linker.link_options = "%{flags} /OUT:%{outfile} %{objs} %{flags_before_libraries} %{libs} %{flags_after_libraries}" end conf.archiver do |archiver| |