Skip to content

Commit

Permalink
gcc-2.95.2-7(cygwin) support.
Browse files Browse the repository at this point in the history
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1155 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
eban committed Jan 31, 2001
1 parent 35e5ddf commit e9f9915
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 10 deletions.
7 changes: 7 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
Wed Jan 31 22:27:29 2001 WATANABE Hirofumi <[email protected]>

* configure.in: gcc-2.95.2-7(cygwin) support.
add -mwin32 if available.

* cygwin/GNUmakefile: ditto.

Mon Jan 29 14:25:39 2001 Yukihiro Matsumoto <[email protected]>

* eval.c (block_pass): return from block jumps directory to
Expand Down
20 changes: 13 additions & 7 deletions configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,20 @@ AC_CHECK_TOOL(AR, ar)
AC_CHECK_PROGS(AR, ar aal, ar)

case "$target_os" in
cygwin*|mingw*)
AC_CHECK_TOOL(NM, nm)
AC_CHECK_TOOL(DLLWRAP, dllwrap)
AC_CHECK_TOOL(AS, as)
AC_CHECK_TOOL(DLLTOOL, dlltool)
AC_CHECK_TOOL(WINDRES, windres)
;;
cygwin*|mingw*)
AC_CHECK_TOOL(NM, nm)
AC_CHECK_TOOL(DLLWRAP, dllwrap)
AC_CHECK_TOOL(AS, as)
AC_CHECK_TOOL(DLLTOOL, dlltool)
AC_CHECK_TOOL(WINDRES, windres)
echo 'main(){}' > conftest.c
if $CC -mwin32 -c conftest.c 2> /dev/null; then
MWIN32=-mwin32
CFLAGS="$CFLAGS $MWIN32"
fi
;;
esac
AC_SUBST(MWIN32)

AC_PROG_LN_S
AC_PROG_MAKE_SET
Expand Down
2 changes: 1 addition & 1 deletion cygwin/GNUmakefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ $(LIBRUBY_SO): $(RUBYDEF) $(LIBRUBY_SO).res.@OBJEXT@
$(LIBRUBY): $(LIBRUBY_SO)

%.res.@OBJEXT@: %.rc
@WINDRES@ --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@
@WINDRES@ --preprocessor '$(CC) -E -xc-header -DRC_INVOKE @MWIN32@' --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@

$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(LIBRUBY_SO).rc: rbconfig.rb
@@MINIRUBY@ $(srcdir)/win32/resource.rb \
Expand Down
4 changes: 2 additions & 2 deletions version.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#define RUBY_VERSION "1.7.0"
#define RUBY_RELEASE_DATE "2001-01-29"
#define RUBY_RELEASE_DATE "2001-01-31"
#define RUBY_VERSION_CODE 170
#define RUBY_RELEASE_CODE 20010129
#define RUBY_RELEASE_CODE 20010131

0 comments on commit e9f9915

Please sign in to comment.