From 0b178b8bed6061a16427aba8264b75ae19756fc8 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 22 Oct 2002 04:19:26 +0000
Subject: * instruby.rb: add dryrun mode.

* ext/extmk.rb (extmake): avoid Borland make's quirk behavior.

* lib/mkmf.rb (link_command): opt is not a makefile macro.

* bcc32/Makefile.sub ($(LIBRUBY_SO) $(LIBRUBY)): EXTOBJS were not
  linked.

* bcc32/Makefile.sub (ext/extinit.obj): missing.

* bcc32/Makefile.sub (TRY_LINK): options have to place before any
  non-option arguments.

* win32/Makefile.sub (TRY_LINK): need -link and -libpath options.

* bcc32/Makefile.sub, win32/Makefile.sub (RANLIB): logical
  operator never work with command.com.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@2979 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/extmk.rb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'ext')

diff --git a/ext/extmk.rb b/ext/extmk.rb
index ebe562c7d..5bb32f584 100644
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -200,9 +200,12 @@ if $extlist.size > 0
   if RUBY_PLATFORM =~ /m68k-human|beos/
     $extlibs.gsub!("-L/usr/local/lib", "") if $extlibs
   end
-  conf = ['SETUP='+$setup, 'EXTOBJS='+$extobjs.strip]
-  conf << 'EXTLIBS='+$extlibs.strip if $extlibs
-  conf << 'EXTLDFLAGS='+$extflags.strip if $extflags
+  conf = [
+    ['SETUP', $setup], ['EXTOBJS', $extobjs],
+    ['EXTLIBS', $extlibs], ['EXTLDFLAGS', $extflags]
+  ].map {|n, v|
+    "#{n}=#{v}" if v and !(v = v.strip).empty?
+  }.compact
   puts conf
   ARGV.concat(conf)
 end
-- 
cgit