From fa7a5d5477dd8015b9bc0be9dc7ef2bf583e46d8 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 8 Apr 2004 10:45:21 +0000
Subject: * ext/extmk.rb (extmake): skip uncompiled extensions.

* lib/mkmf.rb (create_makefile): emit no rules for static library if
  $static is nil, e.g., outside of ext/.

* lib/test/unit/ui/console/testrunner.rb (test_started): show test
  name via $0.

* runruby.rb: set environments to use the compiled binary.

* test/runner.rb: do nothing while cross-compiling.

* test/drb/drbtest.rb, test/soap/calc/test_calc_cgi.rb: use envutil to
  know ruby binary.

* test/ruby/envutil.rb: give priority to RUBY environment variable to
  use just compiled binary and libraries.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6125 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/extmk.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'ext')

diff --git a/ext/extmk.rb b/ext/extmk.rb
index f6f5224652..84c378fcc7 100644
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -103,6 +103,8 @@ def extmake(target)
       else
 	if $static
 	  m = File.read(makefile)
+	  $target = m[/^TARGET[ \s]*=[ \s]*(\S*)/, 1] or $static = nil
+	  /^STATIC_LIB[ \t]*=[ \t]*\S+/ =~ m or $static = nil
 	  $preload = Shellwords.shellwords(m[/^preload[ \t]*=[ \t]*(.*)/, 1] || "")
 	  $DLDFLAGS += " " + (m[/^DLDFLAGS[ \t]*=[ \t]*(.*)/, 1] || "")
 	  if s = m[/^LIBS[ \t]*=[ \t]*(.*)/, 1]
-- 
cgit v1.2.3