File tree Expand file tree Collapse file tree 4 files changed +5
-1
lines changed Expand file tree Collapse file tree 4 files changed +5
-1
lines changed Original file line number Diff line number Diff line change @@ -34,6 +34,7 @@ def feature_name(crossruby)
34
34
def make_args ( crossruby )
35
35
make_args = [ ]
36
36
make_args << "CC=#{ @toolchain . cc } "
37
+ make_args << "CXX=#{ @toolchain . cc } "
37
38
make_args << "LD=#{ @toolchain . ld } "
38
39
make_args << "AR=#{ @toolchain . ar } "
39
40
make_args << "RANLIB=#{ @toolchain . ranlib } "
Original file line number Diff line number Diff line change @@ -26,6 +26,7 @@ def system_triplet_args
26
26
def tools_args
27
27
args = [ ]
28
28
args << "CC=#{ @toolchain . cc } "
29
+ args << "CXX=#{ @toolchain . cxx } "
29
30
args << "LD=#{ @toolchain . ld } "
30
31
args << "AR=#{ @toolchain . ar } "
31
32
args << "RANLIB=#{ @toolchain . ranlib } "
Original file line number Diff line number Diff line change @@ -43,7 +43,7 @@ def self.check_executable(command)
43
43
tool
44
44
end
45
45
46
- %i[ cc ranlib ld ar ] . each do |name |
46
+ %i[ cc cxx ranlib ld ar ] . each do |name |
47
47
define_method ( name ) do
48
48
@tools_cache ||= { }
49
49
@tools_cache [ name ] ||= find_tool ( name )
@@ -84,6 +84,7 @@ def initialize(
84
84
85
85
@tools = {
86
86
cc : "#{ wasi_sdk_path } /bin/clang" ,
87
+ cxx : "#{ wasi_sdk_path } /bin/clang++" ,
87
88
ld : "#{ wasi_sdk_path } /bin/clang" ,
88
89
ar : "#{ wasi_sdk_path } /bin/llvm-ar" ,
89
90
ranlib : "#{ wasi_sdk_path } /bin/llvm-ranlib"
Original file line number Diff line number Diff line change @@ -242,6 +242,7 @@ module RubyWasm
242
242
def self.find_path : (String command) -> String?
243
243
def self.check_executable : (String command) -> String
244
244
def cc : -> String
245
+ def cxx : -> String
245
246
def ranlib : -> String
246
247
def ld : -> String
247
248
def ar : -> String
You can’t perform that action at this time.
0 commit comments