Merge pull request #449 from ruby/pr-acf8683dede39ad90db26650c07f4b9e…

…97bc59d2 Allow using `CXX` in extconf.rb
ruby · May 4, 2024 · 9fda893 · 9fda893
2 parents dde5b52 + 03c72b4
commit 9fda893
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/lib/ruby_wasm/build/product/crossruby.rb b/lib/ruby_wasm/build/product/crossruby.rb
@@ -34,6 +34,7 @@ def feature_name(crossruby)
     def make_args(crossruby)
       make_args = []
       make_args << "CC=#{@toolchain.cc}"
+      make_args << "CXX=#{@toolchain.cc}"
       make_args << "LD=#{@toolchain.ld}"
       make_args << "AR=#{@toolchain.ar}"
       make_args << "RANLIB=#{@toolchain.ranlib}"

diff --git a/lib/ruby_wasm/build/product/product.rb b/lib/ruby_wasm/build/product/product.rb
@@ -26,6 +26,7 @@ def system_triplet_args
     def tools_args
       args = []
       args << "CC=#{@toolchain.cc}"
+      args << "CXX=#{@toolchain.cxx}"
       args << "LD=#{@toolchain.ld}"
       args << "AR=#{@toolchain.ar}"
       args << "RANLIB=#{@toolchain.ranlib}"

diff --git a/lib/ruby_wasm/build/toolchain.rb b/lib/ruby_wasm/build/toolchain.rb
@@ -43,7 +43,7 @@ def self.check_executable(command)
       tool
     end
 
-    %i[cc ranlib ld ar].each do |name|
+    %i[cc cxx ranlib ld ar].each do |name|
       define_method(name) do
         @tools_cache ||= {}
         @tools_cache[name] ||= find_tool(name)
@@ -84,6 +84,7 @@ def initialize(
 
       @tools = {
         cc: "#{wasi_sdk_path}/bin/clang",
+        cxx: "#{wasi_sdk_path}/bin/clang++",
         ld: "#{wasi_sdk_path}/bin/clang",
         ar: "#{wasi_sdk_path}/bin/llvm-ar",
         ranlib: "#{wasi_sdk_path}/bin/llvm-ranlib"

diff --git a/sig/ruby_wasm/build.rbs b/sig/ruby_wasm/build.rbs
@@ -242,6 +242,7 @@ module RubyWasm
     def self.find_path: (String command) -> String?
     def self.check_executable: (String command) -> String
     def cc: -> String
+    def cxx: -> String
     def ranlib: -> String
     def ld: -> String
     def ar: -> String