Skip to content

Commit bb05e0b

Browse files
committed
[GR-47392] Exclude Fortran-related files in the llvm-toolchain in Ruby standalones
PullRequest: truffleruby/4021
2 parents 5178af3 + 50825e6 commit bb05e0b

File tree

2 files changed

+22
-1
lines changed

2 files changed

+22
-1
lines changed

mx.truffleruby/mx_truffleruby.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ def ruby_maven_deploy_public(args):
246246
standalone_dependencies_common = {
247247
'LLVM Runtime Core': ('lib/sulong', []),
248248
'LLVM Runtime Native': ('lib/sulong', []),
249-
'LLVM.org toolchain': ('lib/llvm-toolchain', []),
249+
'LLVM.org toolchain': ('lib/llvm-toolchain', ['bin/flang-*', 'bin/f18*', 'lib/libFortran*', 'include/flang']),
250250
}
251251

252252
mx_sdk_vm.register_graalvm_component(mx_sdk_vm.GraalVmLanguage(

spec/truffle/standalone_spec.rb

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Copyright (c) 2023 Oracle and/or its affiliates. All rights reserved. This
2+
# code is released under a tri EPL/GPL/LGPL license. You can use it,
3+
# redistribute it and/or modify it under the terms of the:
4+
#
5+
# Eclipse Public License version 2.0, or
6+
# GNU General Public License version 2, or
7+
# GNU Lesser General Public License version 2.1.
8+
# OTHER DEALINGS IN THE SOFTWARE.
9+
10+
require_relative '../ruby/spec_helper'
11+
12+
describe "The standalone" do
13+
llvm_toolchain = "#{Truffle::Boot.ruby_home}/lib/llvm-toolchain"
14+
guard -> { Dir.exist? llvm_toolchain } do
15+
it "should not include Fortran-related files in the toolchain" do
16+
Dir.glob("#{llvm_toolchain}/bin/flang*").should.empty?
17+
Dir.glob("#{llvm_toolchain}/lib/libFortran*").should.empty?
18+
Dir.glob("#{llvm_toolchain}/include/flang/*").should.empty?
19+
end
20+
end
21+
end

0 commit comments

Comments
 (0)