1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11191 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2006-10-19 15:38:31 +00:00
parent 105712fe42
commit bbb0bf8049
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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> 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] * array.c (rb_ary_shift): shorten copy size. fixed: [ruby-list:42907]

1
bcc32/Makefile.sub
View File

@ -431,6 +431,7 @@ $(LIBRUBY_A): $(OBJS) $(DMYEXT)
$(LIBRUBY_SO): $(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res $(LIBRUBY_SO): $(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res
@echo $(DLDOBJS) @echo $(DLDOBJS)
@$(PRE_LIBRUBY_UPDATE)
$(LIBRUBY_LDSHARED) $(LIBRUBY_DLDFLAGS) $(DLDOBJS:/=\),$(LIBRUBY_SO),nul,$(LIBRUBY_A) $(LIBS),$(RUBYDEF),$(RUBY_SO_NAME).res $(LIBRUBY_LDSHARED) $(LIBRUBY_DLDFLAGS) $(DLDOBJS:/=\),$(LIBRUBY_SO),nul,$(LIBRUBY_A) $(LIBS),$(RUBYDEF),$(RUBY_SO_NAME).res
$(LIBRUBY): $(LIBRUBY_SO) $(LIBRUBY): $(LIBRUBY_SO)

11
ext/extmk.rb
View File

@ -464,7 +464,7 @@ void Init_ext _((void))\n{\n char *src;#$extinit}
open(extinit.c, "w") {|fe| fe.print src} open(extinit.c, "w") {|fe| fe.print src}
end end
$extobjs = "ext/#{extinit.o} " + $extobjs $extobjs = "ext/#{extinit.o} #{$extobjs}"
if RUBY_PLATFORM =~ /m68k-human|beos/ if RUBY_PLATFORM =~ /m68k-human|beos/
$extflags.delete("-L/usr/local/lib") $extflags.delete("-L/usr/local/lib")
end end
@ -502,7 +502,14 @@ $stdout.flush
$mflags.concat(rubies) $mflags.concat(rubies)
if $nmake == ?b 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 end
system($make, *sysquote($mflags)) or exit($?.exitstatus) system($make, *sysquote($mflags)) or exit($?.exitstatus)