From 711fc22f349fdf98e0ae2040e4a2221c12f0c110 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 6 Feb 2005 16:23:03 +0000
Subject: * lib/mkmf.rb (with_cppflags, with_cflags, with_ldflags): keep flags 
  modified if the block returned true.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@7905 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/mkmf.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index ce8876023..c5cfad30b 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -294,25 +294,25 @@ end
 def with_cppflags(flags)
   cppflags = $CPPFLAGS
   $CPPFLAGS = flags
-  return yield
+  ret = yield
 ensure
-  $CPPFLAGS = cppflags
+  $CPPFLAGS = cppflags unless ret
 end
 
 def with_cflags(flags)
   cflags = $CFLAGS
   $CFLAGS = flags
-  return yield
+  ret = yield
 ensure
-  $CFLAGS = cflags
+  $CFLAGS = cflags unless ret
 end
 
 def with_ldflags(flags)
   ldflags = $LDFLAGS
   $LDFLAGS = flags
-  return yield
+  ret = yield
 ensure
-  $LDFLAGS = ldflags
+  $LDFLAGS = ldflags unless ret
 end
 
 def try_static_assert(expr, headers = nil, opt = "", &b)
-- 
cgit