summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-10-19 15:38:31 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-10-19 15:38:31 +0000
commit23575b58ba3ba5f9fb9b473e9c3390e0dbecf94e (patch)
treeeeb2bafb22572acf42addda15e0daac40d12e9d1
parenta740af0cc3891388e60788bd10530801b6ba1de3 (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
-rw-r--r--ChangeLog6
-rw-r--r--bcc32/Makefile.sub1
-rw-r--r--ext/extmk.rb11
3 files changed, 16 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a9c4093..3ddc8c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 7476dc6..e01573e 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 000cb18..99c2d65 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)