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 | b74e36be76dec3e25ed7168f3c6bf4b19b7b010c (patch) | |
tree | eeb2bafb22572acf42addda15e0daac40d12e9d1 | |
parent | cc5e7bd88bc48b06ab8c451748a4a3bd714fb860 (diff) | |
download | ruby-b74e36be76dec3e25ed7168f3c6bf4b19b7b010c.tar.gz ruby-b74e36be76dec3e25ed7168f3c6bf4b19b7b010c.tar.xz ruby-b74e36be76dec3e25ed7168f3c6bf4b19b7b010c.zip |
* bcc32/Makefile.sub ($(LIBRUBY_SO)): execute pre-link hook.
* ext/extmk.rb: workaround for Borland make.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@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 7476dc6c2..e01573e8f 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -420,6 +420,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 000cb1856..99c2d6509 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) |