diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.in | 17 | ||||
| -rw-r--r-- | lib/mkmf.rb | 4 | ||||
| -rw-r--r-- | version.h | 4 |
4 files changed, 17 insertions, 15 deletions
@@ -1,3 +1,10 @@ +Tue Oct 22 00:59:59 2002 WATANABE Hirofumi <eban@ruby-lang.org> + + * configure.in (RUBY_CPPOUTFILE): fix cache file bug. + + * lib/mkmf.rb (link_command): put 'opt' after conftest.c for + static linking. + Mon Oct 21 22:53:02 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net> * configure.in (XCFLAGS): CFLAGS to comile ruby itself. diff --git a/configure.in b/configure.in index c5637dd8bc..da394dcb0c 100644 --- a/configure.in +++ b/configure.in @@ -18,19 +18,14 @@ test "$rb_cv_mingw32" = yes && target_os="mingw32" esac]) AC_DEFUN(RUBY_CPPOUTFILE, -[AC_CACHE_CHECK(whether ${CPP} accepts -o, rb_cv_cppoutfile, [cppflags=$CPPFLAGS -CPPFLAGS='-o conftest.i' -AC_TRY_CPP([], rb_cv_cppoutfile=yes, rb_cv_cppoutfile=no) -if test "$rb_cv_cppoutfile" = yes; then - CPPOUTFILE=$CPPFLAGS -else - CPPOUTFILE='> conftest.i' -fi -CPPFLAGS=$cppflags -AC_SUBST(CPPOUTFILE) +AC_CACHE_CHECK(whether ${CPP} accepts -o, rb_cv_cppoutfile, +[CPPFLAGS='-o conftest.i' +AC_TRY_CPP([], rb_cv_cppoutfile="$CPPFLAGS", rb_cv_cppoutfile=' >conftest.i') rm -f conftest*]) -]) +CPPOUTFILE="$rb_cv_cppoutfile" +AC_SUBST(CPPOUTFILE) +CPPFLAGS=$cppflags]) AC_DEFUN(RUBY_PROG_GNU_LD, [AC_CACHE_CHECK(whether the linker is GNU ld, rb_cv_prog_gnu_ld, diff --git a/lib/mkmf.rb b/lib/mkmf.rb index dab92c084c..a4ddda06d2 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -202,11 +202,11 @@ def link_command(ldflags, opt="", libpath=$LIBPATH) 'src' => CONFTEST_C, 'INCFLAGS' => $INCFLAGS, 'CPPFLAGS' => $CPPFLAGS, - 'CFLAGS' => "#$CFLAGS #{opt}", + 'CFLAGS' => "#$CFLAGS", 'LDFLAGS' => "#$LDFLAGS #{ldflags}", 'LIBPATH' => libpathflag(libpath), 'LOCAL_LIBS' => "#$LOCAL_LIBS #$libs", - 'LIBS' => "#$LIBRUBYARG #$LIBS") + 'LIBS' => "#$LIBRUBYARG ${opt} #$LIBS") end def cc_command(opt="") @@ -1,4 +1,4 @@ #define RUBY_VERSION "1.7.3" -#define RUBY_RELEASE_DATE "2002-10-21" +#define RUBY_RELEASE_DATE "2002-10-22" #define RUBY_VERSION_CODE 173 -#define RUBY_RELEASE_CODE 20021021 +#define RUBY_RELEASE_CODE 20021022 |