nobu	2018-11-08 01:51:19 +0900 (Thu, 08 Nov 2018)

  New Revision: 65611

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=65611

  Log:
    Clear CC_WRAPPER in other than the toplevel

  Modified files:
    trunk/configure.ac
    trunk/lib/mkmf.rb
Index: configure.ac
===================================================================
--- configure.ac	(revision 65610)
+++ configure.ac	(revision 65611)
@@ -3883,6 +3883,7 @@ AS_IF([test x"$CC_WRAPPER" != x], [ https://github.com/ruby/ruby/blob/trunk/configure.ac#L3883
     CC_WRAPPER='$(rubyarchdir)/darwin-cc'
     XCC_WRAPPER='$(top_srcdir)/tool/darwin-cc'
 ])
+AC_SUBST(CC_WRAPPER, '')
 AC_SUBST(XCC_WRAPPER)
 
 AS_CASE([" $CPP "], [*" $CC "*], [CPP=`echo " $CPP " | sed "s| $CC |"' $(CC) |;s/^ *//;s/  *$//'`])
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 65610)
+++ lib/mkmf.rb	(revision 65611)
@@ -1971,6 +1971,7 @@ VPATH = #{vpath.join(CONFIG['PATH_SEPARA https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L1971
     headers << '$(RUBY_EXTCONF_H)' if $extconf_h
     mk << %{
 
+CC_WRAPPER = #{CONFIG['CC_WRAPPER']}
 CC = #{CONFIG['CC']}
 CXX = #{CONFIG['CXX']}
 LIBRUBY = #{CONFIG['LIBRUBY']}
@@ -2519,6 +2520,9 @@ site-install-rb: install-rb https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L2520
       end
       $warnflags = config['warnflags'] unless $extmk
     end
+    if (w = rbconfig['CC_WRAPPER']) and !w.empty? and !File.executable?(w)
+      rbconfig['CC_WRAPPER'] = config['CC_WRAPPER'] = ''
+    end
     $CFLAGS = with_config("cflags", arg_config("CFLAGS", config["CFLAGS"])).dup
     $CXXFLAGS = (with_config("cxxflags", arg_config("CXXFLAGS", config["CXXFLAGS"]))||'').dup
     $ARCH_FLAG = with_config("arch_flag", arg_config("ARCH_FLAG", config["ARCH_FLAG"])).dup

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/