diff options
| author | Yukihiro Matz Matsumoto <[email protected]> | 2013-01-30 07:33:35 +0900 |
|---|---|---|
| committer | Yukihiro Matz Matsumoto <[email protected]> | 2013-01-30 07:33:35 +0900 |
| commit | 24679c6dd64a09a18d9576b4d87a11b3fd223268 (patch) | |
| tree | 40d0bbd0fe65191b90a4f8b021d012bb2f5643a7 /tasks/toolchains | |
| parent | 78b362f8dd1713895596a241a35be4299d4f84a8 (diff) | |
| parent | 6440f108bde035ec4c738f261062fe281b77053e (diff) | |
| download | mruby-24679c6dd64a09a18d9576b4d87a11b3fd223268.tar.gz mruby-24679c6dd64a09a18d9576b4d87a11b3fd223268.zip | |
resolve conflict
Diffstat (limited to 'tasks/toolchains')
| -rw-r--r-- | tasks/toolchains/clang.rake | 2 | ||||
| -rw-r--r-- | tasks/toolchains/gcc.rake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tasks/toolchains/clang.rake b/tasks/toolchains/clang.rake index 1785c4c79..d5d2ccd7c 100644 --- a/tasks/toolchains/clang.rake +++ b/tasks/toolchains/clang.rake @@ -1,7 +1,7 @@ MRuby::Toolchain.new(:clang) do |conf| toolchain :gcc - [conf.cc, conf.cxx, conf.objc].each do |cc| + [conf.cc, conf.cxx, conf.objc, conf.asm].each do |cc| cc.command = ENV['CC'] || 'clang' end conf.linker.command = ENV['LD'] || 'clang' diff --git a/tasks/toolchains/gcc.rake b/tasks/toolchains/gcc.rake index 2c160683d..bef9b8618 100644 --- a/tasks/toolchains/gcc.rake +++ b/tasks/toolchains/gcc.rake @@ -1,5 +1,5 @@ MRuby::Toolchain.new(:gcc) do |conf| - [conf.cc, conf.cxx, conf.objc].each do |cc| + [conf.cc, conf.cxx, conf.objc, conf.asm].each do |cc| cc.command = ENV['CC'] || 'gcc' cc.flags = [ENV['CFLAGS'] || %w(-g -O3 -Wall -Werror-implicit-function-declaration)] cc.include_paths = ["#{root}/include"] |