diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-11-22 14:06:45 -0800 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-11-22 14:06:45 -0800 |
| commit | a2e0c6ea3a104510ad3a5ecc0ee0f96297f6a550 (patch) | |
| tree | cc04c4c905274741aed27ee20ae2f5b957a47a9e /tasks | |
| parent | cfd975037c0b154f31ff50acd871670973da7eaf (diff) | |
| parent | 172cd281ba221e02ef293f85d25ebe7caed8f314 (diff) | |
| download | mruby-a2e0c6ea3a104510ad3a5ecc0ee0f96297f6a550.tar.gz mruby-a2e0c6ea3a104510ad3a5ecc0ee0f96297f6a550.zip | |
Merge pull request #1592 from perlun/auto-toolchain
Automatically detect toolchain if it is visualcpp, and hence we drop vs2010.rake altogether - it’s no longer needed.
Diffstat (limited to 'tasks')
| -rw-r--r-- | tasks/toolchains/visualcpp.rake (renamed from tasks/toolchains/vs2012.rake) | 2 | ||||
| -rw-r--r-- | tasks/toolchains/vs2010.rake | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/tasks/toolchains/vs2012.rake b/tasks/toolchains/visualcpp.rake index f4039cc29..fc51dbc02 100644 --- a/tasks/toolchains/vs2012.rake +++ b/tasks/toolchains/visualcpp.rake @@ -1,4 +1,4 @@ -MRuby::Toolchain.new(:vs2012) do |conf| +MRuby::Toolchain.new(:visualcpp) do |conf| [conf.cc, conf.cxx].each do |cc| cc.command = ENV['CC'] || 'cl.exe' cc.flags = [ENV['CFLAGS'] || %w(/c /nologo /W3 /D_DEBUG /MDd /Zi /Od /RTC1 /DHAVE_STRING_H /DNO_GETTIMEOFDAY /D_CRT_SECURE_NO_WARNINGS)] diff --git a/tasks/toolchains/vs2010.rake b/tasks/toolchains/vs2010.rake deleted file mode 100644 index 783dc8831..000000000 --- a/tasks/toolchains/vs2010.rake +++ /dev/null @@ -1,3 +0,0 @@ -MRuby::Toolchain.new(:vs2010) do |conf| - toolchain :vs2012 -end |