diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-09-25 08:49:17 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-09-25 08:49:17 +0000 |
| commit | 44b2f1609ca6a4732066c70f06499e46ab5b6bf9 (patch) | |
| tree | e5ca92b63d92ba85e3b9bc64dab8faa0c6122dc4 | |
| parent | 4b9a7eac05e10555d3ee700e5c4c7a1c6938c279 (diff) | |
* lib/mkmf.rb (libpathflag): restore ENV['LIB'] when some error occured.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2889 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib/mkmf.rb | 7 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Wed Sep 25 17:46:46 2002 NAKAMURA Usaku <usa@ruby-lang.org> + + * lib/mkmf.rb (libpathflag): restore ENV['LIB'] when some error occured. + Mon Sep 23 23:22:43 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net> * eval.c (rb_call0): must not clear ruby_current_node, or diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 04e6acdb6c..f27a7faf2f 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -211,8 +211,11 @@ end def libpathflag if $mswin ENV['LIB'] = ($LIBPATH + [ORIG_LIBPATH]).join(';') - yield "" - ENV['LIB'] = ORIG_LIBPATH + begin + yield "" + ensure + ENV['LIB'] = ORIG_LIBPATH + end else yield $LIBPATH.map{|x| %Q[#{LIBPATHFLAG}"#{x}"]}.join end |