mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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
This commit is contained in:
parent
4b9a7eac05
commit
44b2f1609c
2 changed files with 9 additions and 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>
|
Mon Sep 23 23:22:43 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
|
||||||
|
|
||||||
* eval.c (rb_call0): must not clear ruby_current_node, or
|
* eval.c (rb_call0): must not clear ruby_current_node, or
|
||||||
|
|
|
@ -211,8 +211,11 @@ end
|
||||||
def libpathflag
|
def libpathflag
|
||||||
if $mswin
|
if $mswin
|
||||||
ENV['LIB'] = ($LIBPATH + [ORIG_LIBPATH]).join(';')
|
ENV['LIB'] = ($LIBPATH + [ORIG_LIBPATH]).join(';')
|
||||||
yield ""
|
begin
|
||||||
ENV['LIB'] = ORIG_LIBPATH
|
yield ""
|
||||||
|
ensure
|
||||||
|
ENV['LIB'] = ORIG_LIBPATH
|
||||||
|
end
|
||||||
else
|
else
|
||||||
yield $LIBPATH.map{|x| %Q[#{LIBPATHFLAG}"#{x}"]}.join
|
yield $LIBPATH.map{|x| %Q[#{LIBPATHFLAG}"#{x}"]}.join
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Reference in a new issue