Added link_command for C++

1 files changed, 10 insertions, 0 deletions

diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index e671ac90e2..eabccd48eb 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -2792,6 +2792,11 @@ realclean: distclean
 
     CONFTEST_CXX = "#{CONFTEST}.#{config_string('CXX_EXT') || CXX_EXT[0]}"
 
+    TRY_LINK_CXX = config_string('TRY_LINK_CXX') ||
+                   ((cmd = TRY_LINK.gsub(/\$\(C(?:C|(FLAGS))\)/, '$(CXX\1)')) != TRY_LINK && cmd) ||
+                   "$(CXX) #{OUTFLAG}#{CONFTEST}#{$EXEEXT} $(INCFLAGS) $(CPPFLAGS) " \
+                   "$(CXXFLAGS) $(src) $(LIBPATH) $(LDFLAGS) $(ARCH_FLAG) $(LOCAL_LIBS) $(LIBS)"
+
     def have_devel?
       unless defined? @have_devel
         @have_devel = true
@@ -2809,6 +2814,11 @@ realclean: distclean
       RbConfig::expand("$(CXX) #$INCFLAGS #$CPPFLAGS #$CXXFLAGS #$ARCH_FLAG #{opt} -c #{CONFTEST_CXX}",
                        conf)
     end
+
+    def link_command(ldflags, *opts)
+      conf = link_config(ldflags, *opts)
+      RbConfig::expand(TRY_LINK_CXX.dup, conf)
+    end
   end
 end