Skip to content

Add Emscripten toolchain & build_config #6487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matz merged 1 commit into from
Mar 9, 2025
Merged

Add Emscripten toolchain & build_config #6487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions build_config/emscripten-cxx.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Make sure to add these compile options:
# build/emscripten-cxx/host-bin/mruby-config --cxxflags
#
# Make sure to add these link options:
# build/emscripten-cxx/host-bin/mruby-config --ldflags --libs
Comment thread
esotericpig marked this conversation as resolved.
MRuby::CrossBuild.new('emscripten-cxx') do |conf|
conf.toolchain :emscripten

conf.gembox 'default'

conf.enable_cxx_abi
end
10 changes: 10 additions & 0 deletions build_config/emscripten.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Make sure to add these compile options:
# build/emscripten/host-bin/mruby-config --cflags
#
# Make sure to add these link options:
# build/emscripten/host-bin/mruby-config --ldflags --libs
Comment thread
esotericpig marked this conversation as resolved.
MRuby::CrossBuild.new('emscripten') do |conf|
conf.toolchain :emscripten

conf.gembox 'default'
end
4 changes: 3 additions & 1 deletion mrbgems/mruby-cmath/src/cmath.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,9 @@ CXDIVc(mrb_complex a, mrb_complex b)

#else

#if defined(__cplusplus) && (defined(__APPLE__) || (defined(__clang__) && (defined(__FreeBSD__) || defined(__OpenBSD__))))
#if defined(__cplusplus) && \
(defined(__APPLE__) || defined(__EMSCRIPTEN__) || \
(defined(__clang__) && (defined(__FreeBSD__) || defined(__OpenBSD__))))
Comment thread
esotericpig marked this conversation as resolved.

#ifdef MRB_USE_FLOAT32
typedef std::complex<float> mrb_complex;
Expand Down
36 changes: 36 additions & 0 deletions tasks/toolchains/emscripten.rake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
MRuby::Toolchain.new(:emscripten) do |conf|
toolchain :clang

# See:
# - https://emscripten.org/docs/tools_reference/emcc.html
# - https://emscripten.org/docs/tools_reference/settings_reference.html
# - https://github.com/emscripten-core/emscripten/blob/main/src/settings.js
compile_and_link_flags = [
]
Comment thread
esotericpig marked this conversation as resolved.
compile_flags = [
*compile_and_link_flags,
'-Wno-unused-but-set-variable',
]
link_flags = [
*compile_and_link_flags,
]

conf.cc do |cc|
cc.command = 'emcc'
cc.flags.concat(compile_flags) unless ENV['CFLAGS']
end

conf.cxx do |cxx|
cxx.command = 'em++'
cxx.flags.concat(compile_flags) unless ENV['CXXFLAGS'] || ENV['CFLAGS']
end

conf.linker do |linker|
linker.command = 'emcc'
linker.flags.concat(link_flags) unless ENV['LDFLAGS']
end

conf.archiver do |archiver|
archiver.command = 'emar'
end
end