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