diff options
| author | Yuichiro MASUI <[email protected]> | 2013-01-28 18:22:11 +0900 |
|---|---|---|
| committer | Yuichiro MASUI <[email protected]> | 2013-01-28 18:22:11 +0900 |
| commit | 5a152c82e640aa1c12e0bedded2233fcd9a8cf18 (patch) | |
| tree | 6df0d04a796d16d83248f48eb4f6396711aee0d9 /tasks/toolchains | |
| parent | 0410bb7623a27ac427f190e3144c85b6446bec05 (diff) | |
| download | mruby-5a152c82e640aa1c12e0bedded2233fcd9a8cf18.tar.gz mruby-5a152c82e640aa1c12e0bedded2233fcd9a8cf18.zip | |
load MRUBY_CONFIG script after 'build_config.rb'
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"] |