diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/mkmf.rb | 16 |
2 files changed, 14 insertions, 7 deletions
@@ -1,3 +1,8 @@ +Wed Aug 22 16:57:04 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/mkmf.rb (configuration): extact least ruby headers list as + ruby_headers. + Wed Aug 22 15:27:50 2012 Koichi Sasada <ko1@atdot.net> * vm_insnhelper.c (vm_setup_method): fix last commit of diff --git a/lib/mkmf.rb b/lib/mkmf.rb index dcbb8596ac..2c50ff568c 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1775,6 +1775,12 @@ VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])} end possible_command = (proc {|s| s if /top_srcdir/ !~ s} unless $extmk) extconf_h = $extconf_h ? "-DRUBY_EXTCONF_H=\\\"$(RUBY_EXTCONF_H)\\\" " : $defs.join(" ") << " " + headers = %w[$(hdrdir)/ruby.h $(hdrdir)/ruby/defines.h] + if RULE_SUBST + headers.each {|h| h.sub!(/.*/, &RULE_SUBST.method(:%))} + end + headers << $config_h + headers << '$(RUBY_EXTCONF_H)' if $extconf_h mk << %{ CC = #{CONFIG['CC']} @@ -1814,6 +1820,8 @@ sitearch = #{CONFIG['sitearch']} ruby_version = #{RbConfig::CONFIG['ruby_version']} ruby = #{$ruby} RUBY = $(ruby#{sep}) +ruby_headers = #{headers.join(' ')} + RM = #{config_string('RM', &possible_command) || '$(RUBY) -run -e rm -- -f'} RM_RF = #{'$(RUBY) -run -e rm -- -rf'} RMDIRS = #{config_string('RMDIRS', &possible_command) || '$(RUBY) -run -e rmdir -- -p'} @@ -2220,13 +2228,7 @@ site-install-rb: install-rb if File.exist?(depend) mfile.print("###\n", *depend_rules(File.read(depend))) else - headers = %w[$(hdrdir)/ruby.h $(hdrdir)/ruby/defines.h] - if RULE_SUBST - headers.each {|h| h.sub!(/.*/, &RULE_SUBST.method(:%))} - end - headers << $config_h - headers << '$(RUBY_EXTCONF_H)' if $extconf_h - mfile.print "$(OBJS): ", headers.join(' '), "\n" + mfile.print "$(OBJS): $(ruby_headers)\n" end $makefile_created = true |