diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-07-09 09:07:42 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-07-09 09:07:42 +0000 |
| commit | 50102f21cd03dc96b20cee4029553609f6064719 (patch) | |
| tree | 5b95fb0862e291a904c79b9cad9fd3963831f254 | |
| parent | 59de33f586f6687f86b33bb93fe9606ab7d16f57 (diff) | |
* lib/mkmf.rb (create_makefile): prevent substitution of macro
definition. fixed: http://www.yotabanana.com/lab/20060624.html#p02
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10493 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/mkmf.rb | 2 |
2 files changed, 5 insertions, 2 deletions
@@ -1,7 +1,10 @@ -Sun Jul 9 18:04:14 2006 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sun Jul 9 18:06:47 2006 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/mkmf.rb (try_constant): fix for value 1 at cross compiling. + * lib/mkmf.rb (create_makefile): prevent substitution of macro + definition. fixed: http://www.yotabanana.com/lab/20060624.html#p02 + Sun Jul 9 00:54:34 2006 Nobuyoshi Nakada <nobu@ruby-lang.org> * eval.c (next_jump): deal with destination of next. diff --git a/lib/mkmf.rb b/lib/mkmf.rb index dada337e45..e711bb2dc4 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1234,7 +1234,7 @@ site-install-rb: install-rb suffixes << m[1] << m[2] implicit = [[m[1], m[2]], [m.post_match]] next - elsif RULE_SUBST and /\A[$\w][^#]*:/ =~ line + elsif RULE_SUBST and /\A(?!\s*\w+\s*=)[$\w][^#]*:/ =~ line line.gsub!(%r"(\s)(?!\.)([^$(){}+=:\s\/\\,]+)(?=\s|\z)") {$1 + RULE_SUBST % $2} end depout << line |