diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-04-08 10:45:21 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-04-08 10:45:21 +0000 |
| commit | 7971aa6cdab3ac6dbb85533d43bde83c0880febc (patch) | |
| tree | 4133ff567ecee458d18ef66b74c64b7e239b509e /ext | |
| parent | 814ce273620320e78bc12483879146e891c67296 (diff) | |
| download | ruby-7971aa6cdab3ac6dbb85533d43bde83c0880febc.tar.gz ruby-7971aa6cdab3ac6dbb85533d43bde83c0880febc.tar.xz ruby-7971aa6cdab3ac6dbb85533d43bde83c0880febc.zip | |
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@6125 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/extmk.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/extmk.rb b/ext/extmk.rb index f6f522465..84c378fcc 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] |