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/mruby_build_commands.rake | |
| parent | 78b362f8dd1713895596a241a35be4299d4f84a8 (diff) | |
| parent | 6440f108bde035ec4c738f261062fe281b77053e (diff) | |
| download | mruby-24679c6dd64a09a18d9576b4d87a11b3fd223268.tar.gz mruby-24679c6dd64a09a18d9576b4d87a11b3fd223268.zip | |
resolve conflict
Diffstat (limited to 'tasks/mruby_build_commands.rake')
| -rw-r--r-- | tasks/mruby_build_commands.rake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tasks/mruby_build_commands.rake b/tasks/mruby_build_commands.rake index 75cfc55c2..b3c83277c 100644 --- a/tasks/mruby_build_commands.rake +++ b/tasks/mruby_build_commands.rake @@ -36,14 +36,14 @@ module MRuby def initialize(build, source_exts=[]) super(build) - @command = ENV['CC'] || 'gcc' + @command = ENV['CC'] || 'cc' @flags = [ENV['CFLAGS'] || []] @source_exts = source_exts @include_paths = ["#{build.root}/include"] @defines = %w() @option_include_path = '-I%s' @option_define = '-D%s' - @compile_options = "%{flags} -MMD -o %{outfile} -c %{infile}" + @compile_options = '%{flags} -o %{outfile} -c %{infile}' end def all_flags(_defineds=[], _include_paths=[], _flags=[]) @@ -111,7 +111,7 @@ module MRuby def initialize(build) super - @command = ENV['LD'] || 'gcc' + @command = ENV['LD'] || 'ld' @flags = (ENV['LDFLAGS'] || []) @flags_before_libraries, @flags_after_libraries = [], [] @libraries = [] |