diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | lib/mkmf.rb | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index ca9c41a383..c528ad0ed0 100644 --- a/configure.ac +++ b/configure.ac @@ -3883,6 +3883,7 @@ AS_IF([test x"$CC_WRAPPER" != x], [ 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/ *$//'`]) diff --git a/lib/mkmf.rb b/lib/mkmf.rb index a1cf99e3de..355ea171ee 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1971,6 +1971,7 @@ VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])} 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 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 |