1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

merge from trunk (r29767)

* win32/setup.mak: use findstr.exe instead of find.exe, because all
  target build platforms should have findstr.exe, and, find.exe often
  means another command such as cygwin's.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@29898 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2010-11-24 04:56:26 +00:00
parent 037968b272
commit 58b7f82c74
2 changed files with 7 additions and 1 deletions

View file

@ -1,3 +1,9 @@
Wed Nov 24 13:55:21 2010 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/setup.mak: use findstr.exe instead of find.exe, because all
target build platforms should have findstr.exe, and, find.exe often
means another command such as cygwin's.
Mon Nov 22 14:13:45 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c: fix checking version of GCC.

View file

@ -119,7 +119,7 @@ int main(int argc, char **argv)
-version-: nul
@$(APPEND)
@$(CPP) -I$(srcdir) <<"Creating $(MAKEFILE)" | find "=" >>$(MAKEFILE)
@$(CPP) -I$(srcdir) <<"Creating $(MAKEFILE)" | findstr "=" >>$(MAKEFILE)
#define RUBY_REVISION 0
#include "version.h"
MAJOR = RUBY_VERSION_MAJOR