* lib/mkmf.rb (rm_f, rm_rf): pass the last hash through if exists.

  [ruby-dev:39153]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 9 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index a4b513e9f0..8ccce2101a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Aug 22 01:29:29 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (rm_f, rm_rf): pass the last hash through if exists.
+	  [ruby-dev:39153]
+
 Sat Aug 22 00:48:08 2009  Tanaka Akira  <akr@fsij.org>
 
 	* enumerator.c (ary2sv): add dup argument.
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index c5e4bd89b4..8d6fc96793 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -194,11 +194,13 @@ class Array
 end
 
 def rm_f(*files)
-  FileUtils.rm_f(Dir[*files])
+  opt = ([files.pop] if Hash === files.last)
+  FileUtils.rm_f(Dir[*files], *opt)
 end
 
 def rm_rf(*files)
-  FileUtils.rm_rf(Dir[*files])
+  opt = ([files.pop] if Hash === files.last)
+  FileUtils.rm_rf(Dir[*files], *opt)
 end
 
 # Returns time stamp of the +target+ file if it exists and is newer