diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2020-08-16 17:56:50 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2020-10-12 16:21:40 +0900 |
| commit | 1520c97e172484af7cbd0f51512cd3ac0025e228 (patch) | |
| tree | 9f54c511eefa4b0f1371b36d8036c53c7f0ff961 /target | |
| parent | 8a87549315d0c7fd984a8ad239ebe3dbab4d2855 (diff) | |
| download | mruby-1520c97e172484af7cbd0f51512cd3ac0025e228.tar.gz mruby-1520c97e172484af7cbd0f51512cd3ac0025e228.zip | |
Add default `host` target for cross compiling.
You don't have to define explicit `host` build target any more.
Diffstat (limited to 'target')
| -rw-r--r-- | target/ArduinoDue.rb | 16 | ||||
| -rw-r--r-- | target/IntelGalileo.rb | 17 | ||||
| -rw-r--r-- | target/RX630.rb | 16 | ||||
| -rw-r--r-- | target/android_arm64-v8a.rb | 15 | ||||
| -rw-r--r-- | target/android_armeabi.rb | 15 | ||||
| -rw-r--r-- | target/android_armeabi_v7a_neon_hard.rb | 15 | ||||
| -rw-r--r-- | target/chipKITMax32.rb | 16 | ||||
| -rw-r--r-- | target/cross-32bit.rb | 7 | ||||
| -rw-r--r-- | target/dreamcast_shelf.rb | 14 |
9 files changed, 4 insertions, 127 deletions
diff --git a/target/ArduinoDue.rb b/target/ArduinoDue.rb index 09646a700..5859f8508 100644 --- a/target/ArduinoDue.rb +++ b/target/ArduinoDue.rb @@ -1,19 +1,3 @@ -MRuby::Build.new do |conf| - - # Gets set by the VS command prompts. - if ENV['VisualStudioVersion'] || ENV['VSINSTALLDIR'] - toolchain :visualcpp - else - toolchain :gcc - end - - enable_debug - - # include the default GEMs - conf.gembox 'default' - -end - # Cross Compiling configuration for Arduino Due # http://arduino.cc/en/Main/ArduinoBoardDue # diff --git a/target/IntelGalileo.rb b/target/IntelGalileo.rb index 42f39c456..e996efa5b 100644 --- a/target/IntelGalileo.rb +++ b/target/IntelGalileo.rb @@ -1,20 +1,3 @@ -MRuby::Build.new do |conf| - - # Gets set by the VS command prompts. - if ENV['VisualStudioVersion'] || ENV['VSINSTALLDIR'] - toolchain :visualcpp - else - toolchain :gcc - end - - enable_debug - - # include the default GEMs - conf.gembox 'default' - -end - - # Cross Compiling configuration for Intel Galileo on Arduino environment # http://arduino.cc/en/ArduinoCertified/IntelGalileo # diff --git a/target/RX630.rb b/target/RX630.rb index 1b1f425c1..01c883958 100644 --- a/target/RX630.rb +++ b/target/RX630.rb @@ -1,19 +1,3 @@ -MRuby::Build.new do |conf| - - # Gets set by the VS command prompts. - if ENV['VisualStudioVersion'] || ENV['VSINSTALLDIR'] - toolchain :visualcpp - else - toolchain :gcc - end - - enable_debug - - # include the default GEMs - conf.gembox 'default' - -end - # Cross Compiling configuration for RX630 # http://gadget.renesas.com/ # diff --git a/target/android_arm64-v8a.rb b/target/android_arm64-v8a.rb index 70b0f4b97..7fab2f063 100644 --- a/target/android_arm64-v8a.rb +++ b/target/android_arm64-v8a.rb @@ -1,18 +1,3 @@ -MRuby::Build.new do |conf| - - # Gets set by the VS command prompts. - if ENV['VisualStudioVersion'] || ENV['VSINSTALLDIR'] - toolchain :visualcpp - else - toolchain :gcc - end - - enable_debug - - # include the default GEMs - conf.gembox 'default' -end - # Requires Android NDK r13 or later. MRuby::CrossBuild.new('android-arm64-v8a') do |conf| params = { diff --git a/target/android_armeabi.rb b/target/android_armeabi.rb index 17330242a..41a657c3b 100644 --- a/target/android_armeabi.rb +++ b/target/android_armeabi.rb @@ -1,18 +1,3 @@ -MRuby::Build.new do |conf| - - # Gets set by the VS command prompts. - if ENV['VisualStudioVersion'] || ENV['VSINSTALLDIR'] - toolchain :visualcpp - else - toolchain :gcc - end - - enable_debug - - # include the default GEMs - conf.gembox 'default' -end - # Requires Android NDK r13 or later. MRuby::CrossBuild.new('android-armeabi') do |conf| params = { diff --git a/target/android_armeabi_v7a_neon_hard.rb b/target/android_armeabi_v7a_neon_hard.rb index 3788bba7f..6129b238e 100644 --- a/target/android_armeabi_v7a_neon_hard.rb +++ b/target/android_armeabi_v7a_neon_hard.rb @@ -1,18 +1,3 @@ -MRuby::Build.new do |conf| - - # Gets set by the VS command prompts. - if ENV['VisualStudioVersion'] || ENV['VSINSTALLDIR'] - toolchain :visualcpp - else - toolchain :gcc - end - - enable_debug - - # include the default GEMs - conf.gembox 'default' -end - # Requires Android NDK r13 or later. MRuby::CrossBuild.new('android-armeabi-v7a-neon-hard') do |conf| params = { diff --git a/target/chipKITMax32.rb b/target/chipKITMax32.rb index 8617d8d10..bbee221f5 100644 --- a/target/chipKITMax32.rb +++ b/target/chipKITMax32.rb @@ -1,19 +1,3 @@ -MRuby::Build.new do |conf| - - # Gets set by the VS command prompts. - if ENV['VisualStudioVersion'] || ENV['VSINSTALLDIR'] - toolchain :visualcpp - else - toolchain :gcc - end - - enable_debug - - # include the default GEMs - conf.gembox 'default' - -end - # Cross Compiling configuration for Digilent chipKIT Max32 # http://www.digilentinc.com/Products/Detail.cfm?Prod=CHIPKIT-MAX32 # diff --git a/target/cross-32bit.rb b/target/cross-32bit.rb index 310ffc833..82d5d023f 100644 --- a/target/cross-32bit.rb +++ b/target/cross-32bit.rb @@ -1,13 +1,14 @@ # Define cross build settings -MRuby::CrossBuild.new('32bit') do |conf| +MRuby::CrossBuild.new('cross-32bit') do |conf| toolchain :gcc conf.cc.flags << "-m32" conf.linker.flags << "-m32" - conf.build_mrbtest_lib_only + # conf.build_mrbtest_lib_only - conf.gem 'examples/mrbgems/c_and_ruby_extension_example' + conf.gem :core => "mruby-bin-mruby" + conf.gem "#{MRUBY_ROOT}/examples/mrbgems/c_and_ruby_extension_example" conf.test_runner.command = 'env' end diff --git a/target/dreamcast_shelf.rb b/target/dreamcast_shelf.rb index 85b2ff20d..3ae53184d 100644 --- a/target/dreamcast_shelf.rb +++ b/target/dreamcast_shelf.rb @@ -1,17 +1,3 @@ -MRuby::Build.new do |conf| - # Gets set by the VS command prompts - if ENV['VisualStudioVersion'] || ENV['VSINSTALLDIR'] - toolchain :visualcpp - else - toolchain :gcc - end - - enable_debug - - # Include the default GEMs - conf.gembox 'default' -end - # Cross Compiling configuration for the Sega Dreamcast # This configuration requires KallistiOS (KOS) # https://dreamcast.wiki |
