* bcc32/Makefile.sub ($(LIBRUBY_SO)): execute pre-link hook.

* ext/extmk.rb: workaround for Borland make.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11191 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 9 insertions, 2 deletions

diff --git a/ext/extmk.rb b/ext/extmk.rb
index 05050d8bb5..fe5080de73 100644
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -464,7 +464,7 @@ void Init_ext _((void))\n{\n    char *src;#$extinit}
     open(extinit.c, "w") {|fe| fe.print src}
   end
 
-  $extobjs = "ext/#{extinit.o} " + $extobjs
+  $extobjs = "ext/#{extinit.o} #{$extobjs}"
   if RUBY_PLATFORM =~ /m68k-human|beos/
     $extflags.delete("-L/usr/local/lib")
   end
@@ -502,7 +502,14 @@ $stdout.flush
 $mflags.concat(rubies)
 
 if $nmake == ?b
-  $mflags.collect {|flag| flag.sub!(/\A(?=\w+=)/, "-D")}
+  unless (vars = $mflags.grep(/\A\w+=/n)).empty?
+    open(mkf = "libruby.mk", "wb") do |f|
+      f.puts("!include Makefile")
+      f.puts(*vars)
+      f.puts("PRE_LIBRUBY_UPDATE = del #{mkf}")
+    end
+    $mflags.delete_if(&/\A\w+=/n.method(:=~)).unshift("-f#{mkf}")
+  end
 end
 system($make, *sysquote($mflags)) or exit($?.exitstatus)