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 | bbb0bf8049b2c65790177af415f02f886b1ed20f (patch) | |
| tree | 4f2fde6a5dd5a540a9a1c81a08bc8bf37083b516 | |
| parent | 105712fe42496689a7565769d2291917cb858c72 (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/trunk@11191 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | bcc32/Makefile.sub | 1 | ||||
| -rw-r--r-- | ext/extmk.rb | 11 |
3 files changed, 16 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Fri Oct 20 00:37:07 2006 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * bcc32/Makefile.sub ($(LIBRUBY_SO)): execute pre-link hook. + + * ext/extmk.rb: workaround for Borland make. + Wed Oct 18 23:02:40 2006 Nobuyoshi Nakada <nobu@ruby-lang.org> * array.c (rb_ary_shift): shorten copy size. fixed: [ruby-list:42907] diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub index 995bd2b269..94245f48a5 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -431,6 +431,7 @@ $(LIBRUBY_A): $(OBJS) $(DMYEXT) $(LIBRUBY_SO): $(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res @echo $(DLDOBJS) + @$(PRE_LIBRUBY_UPDATE) $(LIBRUBY_LDSHARED) $(LIBRUBY_DLDFLAGS) $(DLDOBJS:/=\),$(LIBRUBY_SO),nul,$(LIBRUBY_A) $(LIBS),$(RUBYDEF),$(RUBY_SO_NAME).res $(LIBRUBY): $(LIBRUBY_SO) 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) |