summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-28 01:40:39 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-28 01:40:39 +0000
commit9792f30e5701f6d18ff84f248e1f2b9d6ea02285 (patch)
tree087e3fea5b1247eff8319ea21750103a3e438b3e
parent0d42030c27cc8142dbb431e245d941e8eb5e652c (diff)
* lib/mkmf.rb (checking_for): ignore toplevel.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28047 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/mkmf.rb2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 020528e4e3..53b62ad1b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri May 28 10:40:37 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/mkmf.rb (checking_for): ignore toplevel.
+
Fri May 28 00:47:16 2010 Masaya Tarui <tarui@ruby-lnag.org>
* error.c (rb_bug): suppress the error report dialog if report_bug()
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 47f09f2f66..bf18f110b5 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -685,7 +685,7 @@ end
# Internal use only.
#
def checking_for(m, fmt = nil)
- f = caller[0][/in `(.*)'$/, 1] and f << ": " #` for vim #'
+ f = caller[0][/in `([^<].*)'$/, 1] and f << ": " #` for vim #'
m = "checking #{/\Acheck/ =~ f ? '' : 'for '}#{m}... "
message "%s", m
a = r = nil