Skip to content

preliminary support for clang64 #471

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
larskanis merged 1 commit into from
Jan 7, 2026
Merged

preliminary support for clang64 #471

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
1 change: 1 addition & 0 deletions lib/ruby_installer/build/components/03_dev_tools.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ def description
'mingw32' => PACKAGES_MINGW32,
'mingw64' => PACKAGES_MINGW64,
'ucrt64' => PACKAGES_MINGW64,
'clang64' => PACKAGES_MINGW64,
'clangarm64' => PACKAGES_MINGW64,
}

Expand Down
7 changes: 7 additions & 0 deletions lib/ruby_installer/build/msys2_installation.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ def initialize(msys_path: nil, mingwarch: nil, mingw_package_prefix: nil, ruby_b
when 'mingw32' then "mingw-w64-i686"
when 'mingw64' then "mingw-w64-x86_64"
when 'ucrt64' then "mingw-w64-ucrt-x86_64"
when 'clang64' then "mingw-w64-clang-x86_64"
when 'clangarm64' then "mingw-w64-clang-aarch64"
else raise "unknown mingwarch #{@mingwarch.inspect}"
end
Expand Down Expand Up @@ -188,6 +189,12 @@ def disable_dll_search_paths
vars['MSYSTEM_CHOST'] = 'x86_64-w64-mingw32'
vars['MINGW_CHOST'] = vars['MSYSTEM_CHOST']
vars['MINGW_PREFIX'] = vars['MSYSTEM_PREFIX']
when 'clang64'
vars['MSYSTEM_PREFIX'] = '/clang64'
vars['MSYSTEM_CARCH'] = 'x86_64'
vars['MSYSTEM_CHOST'] = 'x86_64-w64-mingw32'
vars['MINGW_CHOST'] = vars['MSYSTEM_CHOST']
vars['MINGW_PREFIX'] = vars['MSYSTEM_PREFIX']
when 'clangarm64'
vars['MSYSTEM_PREFIX'] = '/clangarm64'
vars['MSYSTEM_CARCH'] = 'aarch64'
Expand Down
5 changes: 4 additions & 1 deletion lib/ruby_installer/runtime/ridk.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,10 @@ def print_logo
DEFAULT_COMPONENTS = %w[1 3]

def install(args)
ci = ComponentsInstaller.new
if args && %w[ucrt64 mingw64 mingw32 clang64 clangarm64].include?(args[0])
msys = Msys2Installation.new(mingwarch: args.shift)
end
ci = ComponentsInstaller.new(msys:)
inst_defaults = DEFAULT_COMPONENTS

if args.empty?
Expand Down
Loading