diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-11-15 10:51:11 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-11-15 10:51:11 +0000 |
| commit | 46ce7c436add4ce29953d810ecc8260f7112fc25 (patch) | |
| tree | 196179a8720215f9b6e34c3298da49068d848093 /lib/mkmf.rb | |
| parent | c93dd36e0ef8bb07c96614ca6f3948eef72ca058 (diff) | |
| download | ruby-46ce7c436add4ce29953d810ecc8260f7112fc25.tar.gz | |
* lib/mkmf.rb (depend_rules): support comments during a line.
* lib/mkmf.rb (depend_rules): apply RULE_SUBST even if the dependency
file contains path.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48437 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/mkmf.rb')
| -rw-r--r-- | lib/mkmf.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 1eb52047a3..513dff3583 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -2051,7 +2051,10 @@ RULES implicit = [[m[1], m[2]], [m.post_match]] next elsif RULE_SUBST and /\A(?!\s*\w+\s*=)[$\w][^#]*:/ =~ line - line.gsub!(%r"(\s)(?!\.)([^$(){}+=:\s\/\\,]+)(?=\s|\z)") {$1 + RULE_SUBST % $2} + line.sub!(/\s*\#.*$/, '') + comment = $& + line.gsub!(%r"(\s)(?!\.)([^$(){}+=:\s\\,]+)(?=\s|\z)") {$1 + RULE_SUBST % $2} + line = line.chomp + comment + "\n" if comment end depout << line end |