diff options
| author | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-10-20 02:33:49 +0000 |
|---|---|---|
| committer | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-10-20 02:33:49 +0000 |
| commit | d53050ffb81a62315d9b015dd33743209a91a6a5 (patch) | |
| tree | 092a0900f6de0d4deaaea1838da687d4c8c152d2 | |
| parent | 65c9b533c02149ae753acfa1f1b785dc366715e0 (diff) | |
| download | ruby-d53050ffb81a62315d9b015dd33743209a91a6a5.tar.gz ruby-d53050ffb81a62315d9b015dd33743209a91a6a5.tar.xz ruby-d53050ffb81a62315d9b015dd33743209a91a6a5.zip | |
* lib/mkmf.rb: fixed the bug of handling COMMON_MACROS.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@11194 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib/mkmf.rb | 3 |
2 files changed, 5 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Fri Oct 20 10:47:43 2006 NAKAMURA Usaku <usa@ruby-lang.org> + + * lib/mkmf.rb: fixed the bug of handling COMMON_MACROS. + Fri Oct 20 08:42:38 2006 Nobuyoshi Nakada <nobu@ruby-lang.org> * common.mk (NULLCMD): dummy command. diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 45900fe0f..d24a407f9 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1511,8 +1511,7 @@ EXPORT_PREFIX = config_string('EXPORT_PREFIX') {|s| s.strip} hdr = [] config_string('COMMON_MACROS') do |s| Shellwords.shellwords(s).each do |w| - /(.*?)(?:=(.*))/ =~ w - hdr << "#define #$1 #$2" + hdr << "#define " + w.split(/=/, 2).join(" ") end end config_string('COMMON_HEADERS') do |s| |