summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-11 13:33:19 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-11 13:33:19 +0000
commit4883d1255266e85e9f8dd5e12ad671fd169a5b31 (patch)
treeb60c7838c5eb6f3239771be3695ad1becd123d0e
parent57bc5eaf2f9b44ad8321fecf6dfa45d82a50c580 (diff)
* ext/extmk.rb: generates the rule for extinit.$(OBJEXT).
extinit.$(OBJEXT) used to be generated by the builtin rule, thus didn't accept custom $(CC) and caused linkage error for cross compiling. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47883 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rwxr-xr-xext/extmk.rb1
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b49fec9d20..7fb0364b1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Oct 11 22:11:58 2014 Yuki Yugui Sonoda <yugui@yugui.jp>
+
+ * ext/extmk.rb: generates the rule for extinit.$(OBJEXT).
+ extinit.$(OBJEXT) used to be generated by the builtin rule, thus
+ didn't accept custom $(CC) and caused linkage error for cross
+ compiling.
+
Sat Oct 11 18:46:50 2014 Yuki Yugui Sonoda <yugui@yugui.jp>
* include/ruby/intern.h (rb_fd_select): declare struct timeval, or the
diff --git a/ext/extmk.rb b/ext/extmk.rb
index 3a240aad0b..e0cd0f11b1 100755
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -724,6 +724,7 @@ if $configure_only and $command_output
rubies.each do |tgt|
mf.puts "#{tgt}:\n\t#{submake} $@"
end
+ mf.puts "ext/extinit.#{$OBJEXT}:\n\t$(Q)$(MAKE) $(MFLAGS) V=$(V) $@" if $static
mf.puts
if $gnumake == "yes"
submake = "$(MAKE) -C $(@D)"