summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-05-27 07:49:06 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-05-27 07:49:06 +0000
commitaee4253e707542c8c0bf72558849ff2f5375e4f6 (patch)
treec7264a7f475b306ab35c0b526db4b40ac164ad7f
parentd44aad57152e8640db9c97394cb8bade1db06d21 (diff)
* lib/mkmf.rb: use the semicolon as the path separator
in the environment of MSYS. fixed: [ruby-dev:26232] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8530 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/mkmf.rb14
2 files changed, 14 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index e4a512d5b3a..9e008b67ede 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri May 27 16:32:04 2005 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * lib/mkmf.rb: use the semicolon as the path separator
+ in the environment of MSYS. fixed: [ruby-dev:26232]
+
Thu May 26 20:31:21 2005 Minero Aoki <aamine@loveruby.net>
* lib/fileutils.rb (remove_entry_secure): add documentation.
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 987c4cb5c42..56cb7050dd9 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -834,11 +834,15 @@ end
def configuration(srcdir)
mk = []
vpath = %w[$(srcdir) $(topdir) $(hdrdir)]
- if !CROSS_COMPILING && CONFIG['build_os'] == 'cygwin' && CONFIG['target_os'] != 'cygwin'
- vpath.each {|p| p.sub!(/.*/, '$(shell cygpath -u \&)')}
- end
- if !CROSS_COMPILING && CONFIG['build_os'] == 'msdosdjgpp'
- CONFIG['PATH_SEPARATOR'] = ';'
+ if !CROSS_COMPILING
+ case CONFIG['build_os']
+ when 'cygwin'
+ if CONFIG['target_os'] != 'cygwin'
+ vpath.each {|p| p.sub!(/.*/, '$(shell cygpath -u \&)')}
+ end
+ when 'msdosdjgpp', 'mingw32'
+ CONFIG['PATH_SEPARATOR'] = ';'
+ end
end
mk << %{
SHELL = /bin/sh