diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-10-19 15:38:31 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-10-19 15:38:31 +0000 |
commit | 23575b58ba3ba5f9fb9b473e9c3390e0dbecf94e (patch) | |
tree | eeb2bafb22572acf42addda15e0daac40d12e9d1 /ext | |
parent | a740af0cc3891388e60788bd10530801b6ba1de3 (diff) |
* 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/branches/ruby_1_8@11191 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r-- | ext/extmk.rb | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/ext/extmk.rb b/ext/extmk.rb index 000cb1856a..99c2d6509e 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") {|f| f.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) |