From 124c4d617f6d5bb8cef4f9858206d7dbf978dbaa Mon Sep 17 00:00:00 2001
From: Dante Catalfamo <dante.catalfamo@gmail.com>
Date: Thu, 19 Aug 2021 23:33:25 -0400
Subject: Add serenity-32bit crossbuild

Cross compile mruby for SerenityOS (https://github.com/SerenityOS/serenity)
---
 build_config/serenity-32bit.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 build_config/serenity-32bit.rb

diff --git a/build_config/serenity-32bit.rb b/build_config/serenity-32bit.rb
new file mode 100644
index 000000000..03ec53c30
--- /dev/null
+++ b/build_config/serenity-32bit.rb
@@ -0,0 +1,12 @@
+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
-- 
cgit v1.2.3


From 5e030491e755ba63fd54b075bcd8fca0c1f296a6 Mon Sep 17 00:00:00 2001
From: Dante Catalfamo <dante.catalfamo@gmail.com>
Date: Fri, 20 Aug 2021 14:48:49 -0400
Subject: Replace 32-bit serenity config with 64-bit compatible version.

---
 build_config/serenity-32bit.rb | 12 ------------
 build_config/serenity.rb       | 23 +++++++++++++++++++++++
 2 files changed, 23 insertions(+), 12 deletions(-)
 delete mode 100644 build_config/serenity-32bit.rb
 create mode 100644 build_config/serenity.rb

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
-- 
cgit v1.2.3


From 7f290bebaf6ee86cf6ef6d7614f6ed8d8f1f6e1f Mon Sep 17 00:00:00 2001
From: Dante Catalfamo <dante.catalfamo@gmail.com>
Date: Fri, 20 Aug 2021 22:27:50 -0400
Subject: Specify potential values for SERENITY_ARCH

---
 build_config/serenity.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build_config/serenity.rb b/build_config/serenity.rb
index 9dc9ea6cb..6704d2673 100644
--- a/build_config/serenity.rb
+++ b/build_config/serenity.rb
@@ -4,6 +4,9 @@
 #
 # Should be built using the SerenityOS Ports system
 # https://github.com/SerenityOS/serenity/tree/master/Ports
+#
+# As of 2021/08/20, SERENITY_ARCH is defined in the SerenityOS Ports
+# build script to always be either "i686" or "x86_64"
 
 MRuby::CrossBuild.new('serenity') do |conf|
   conf.toolchain :gcc
-- 
cgit v1.2.3