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 | 7a51e3d0edfd8808f0fd8e709303cc694d8967e2 (patch) | |
| tree | e5ca92b63d92ba85e3b9bc64dab8faa0c6122dc4 | |
| parent | 73cd3df3cbd260aeff851ec2c07553f1d351109d (diff) | |
| download | ruby-7a51e3d0edfd8808f0fd8e709303cc694d8967e2.tar.gz ruby-7a51e3d0edfd8808f0fd8e709303cc694d8967e2.tar.xz ruby-7a51e3d0edfd8808f0fd8e709303cc694d8967e2.zip | |
* lib/mkmf.rb (libpathflag): restore ENV['LIB'] when some error occured.
git-svn-id: http://svn.ruby-lang.org/repos/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 04e6acdb6..f27a7faf2 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 |