diff options
| author | Dante Catalfamo <[email protected]> | 2021-08-20 14:48:49 -0400 |
|---|---|---|
| committer | Dante Catalfamo <[email protected]> | 2021-08-20 14:48:49 -0400 |
| commit | 5e030491e755ba63fd54b075bcd8fca0c1f296a6 (patch) | |
| tree | 6f1c17e91a2b90172d0258642490ea96f6fe315b | |
| parent | 124c4d617f6d5bb8cef4f9858206d7dbf978dbaa (diff) | |
| download | mruby-5e030491e755ba63fd54b075bcd8fca0c1f296a6.tar.gz mruby-5e030491e755ba63fd54b075bcd8fca0c1f296a6.zip | |
Replace 32-bit serenity config with 64-bit compatible version.
| -rw-r--r-- | build_config/serenity-32bit.rb | 12 | ||||
| -rw-r--r-- | build_config/serenity.rb | 23 |
2 files changed, 23 insertions, 12 deletions
diff --git a/build_config/serenity-32bit.rb b/build_config/serenity-32bit.rb deleted file mode 100644 index 03ec53c30..000000000 --- a/build_config/serenity-32bit.rb +++ /dev/null @@ -1,12 +0,0 @@ -MRuby::CrossBuild.new('serenity-32bit') do |conf| - conf.toolchain :gcc - - conf.archiver.command = 'i686-pc-serenity-ar' - conf.linker.command = 'i686-pc-serenity-g++' - conf.cc.command = 'i686-pc-serenity-gcc' - conf.cc.defines << 'MRB_32BIT' - - conf.gembox 'full-core' - - conf.test_runner.command = 'env' -end diff --git a/build_config/serenity.rb b/build_config/serenity.rb new file mode 100644 index 000000000..9dc9ea6cb --- /dev/null +++ b/build_config/serenity.rb @@ -0,0 +1,23 @@ +# Cross compiling configuration for SerenityOS +# Graphical Unix-like operating system for x86 computers. +# https://github.com/SerenityOS/serenity +# +# Should be built using the SerenityOS Ports system +# https://github.com/SerenityOS/serenity/tree/master/Ports + +MRuby::CrossBuild.new('serenity') do |conf| + conf.toolchain :gcc + + conf.archiver.command = "#{ENV['SERENITY_ARCH']}-pc-serenity-ar" + conf.linker.command = "#{ENV['SERENITY_ARCH']}-pc-serenity-g++" + + conf.cxx.command = "#{ENV['SERENITY_ARCH']}-pc-serenity-g++" + conf.cxx.defines << (ENV['SERENITY_ARCH'].include?('64') ? 'MRB_64BIT' : 'MRB_32BIT') + + conf.cc.command = "#{ENV['SERENITY_ARCH']}-pc-serenity-gcc" + conf.cc.defines << (ENV['SERENITY_ARCH'].include?('64') ? 'MRB_64BIT' : 'MRB_32BIT') + + conf.gembox 'full-core' + + conf.test_runner.command = 'env' +end |