diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-20 12:06:13 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-20 12:06:13 +0000 |
commit | 9041f262e006b3b0c80c47991023bdf68fbab43d (patch) | |
tree | 23ddacd56cb7ac50ef3ea53a83335b0c65e37e2b /ext | |
parent | ffdb70a696725aa89df70d7bffb72d59b943bc78 (diff) | |
download | ruby-9041f262e006b3b0c80c47991023bdf68fbab43d.tar.gz |
extmk.rb: extract SUBMAKEOPTS
* ext/extmk.rb (SUBMAKEOPTS): extract common sub make options.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39337 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rwxr-xr-x | ext/extmk.rb | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/ext/extmk.rb b/ext/extmk.rb index 8997892dc6..659d33ba0d 100755 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -658,6 +658,17 @@ if $configure_only and $command_output mf.macro "EXTOBJS", $extlist.empty? ? ["dmyext.#{$OBJEXT}"] : ["ext/extinit.#{$OBJEXT}", *$extobjs] mf.macro "EXTLIBS", $extlibs mf.macro "EXTLDFLAGS", $extflags.split + submakeopts = [] + if enable_config("shared", $enable_shared) + submakeopts << 'DLDOBJS="$(EXTOBJS) $(ENCOBJS)"' + submakeopts << 'EXTSOLIBS="$(EXTLIBS)"' + submakeopts << 'LIBRUBY_SO_UPDATE=$(LIBRUBY_EXTS)' + else + submakeopts << 'EXTOBJS="$(EXTOBJS) $(ENCOBJS)"' + submakeopts << 'EXTLIBS="$(EXTLIBS)"' + end + submakeopts << 'EXTLDFLAGS="$(EXTLDFLAGS)"' + mf.macro "SUBMAKEOPTS", submakeopts mf.puts targets = %w[all install static install-so install-rb clean distclean realclean] targets.each do |tgt| @@ -668,21 +679,10 @@ if $configure_only and $command_output mf.puts "distclean:\n\t-$(Q)$(RM) ext/extinit.c" mf.puts mf.puts "#{rubies.join(' ')}: $(extensions:/.=/#{$force_static ? 'static' : 'all'})" - (["all static"] + rubies).each_with_index do |tgt, i| - mf.print "#{tgt}:\n\t$(Q)$(MAKE) " - mf.print "$(MFLAGS) " - if enable_config("shared", $enable_shared) - mf.print %[DLDOBJS="$(EXTOBJS) $(ENCOBJS)" EXTSOLIBS="$(EXTLIBS)" ] - mf.print 'LIBRUBY_SO_UPDATE=$(LIBRUBY_EXTS) ' - else - mf.print %[EXTOBJS="$(EXTOBJS) $(ENCOBJS)" EXTLIBS="$(EXTLIBS)" ] - end - mf.print 'EXTLDFLAGS="$(EXTLDFLAGS)" ' - if i == 0 - mf.puts rubies.join(' ') - else - mf.puts '$@' - end + submake = "$(Q)$(MAKE) $(MFLAGS) $(SUBMAKEOPTS)" + mf.puts "all static:\n\t#{submake} #{rubies.join(' ')}\n" + rubies.each do |tgt| + mf.puts "#{tgt}:\n\t#{submake} $@" end mf.puts exec = config_string("exec") {|str| str + " "} |