diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 15 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 15 insertions, 10 deletions
@@ -1,3 +1,7 @@ +Wed Mar 24 18:16:08 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (LDSHARED, CPP): keep $(CC). [ruby-core:28912] + Mon Mar 22 19:32:34 2010 Tadayoshi Funaba <tadf@dotrb.org> * lib/date.rb (Date#>>): fixed. [ruby-core:28011] diff --git a/configure.in b/configure.in index cfbd7a39aa..c1a325da91 100644 --- a/configure.in +++ b/configure.in @@ -1226,20 +1226,20 @@ if test "$with_dln_a_out" != yes; then osf*) : ${LDSHARED="ld -shared -expect_unresolved \"*\""} rb_cv_dlopen=yes ;; bsdi3*) case "$CC" in - *shlicc*) : ${LDSHARED="$CC -r"} + *shlicc*) : ${LDSHARED='$(CC) -r'} rb_cv_dlopen=yes ;; esac ;; linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi*) - : ${LDSHARED='${CC} -shared'} + : ${LDSHARED='$(CC) -shared'} if test "$rb_cv_binary_elf" = yes; then LDFLAGS="$LDFLAGS -Wl,-export-dynamic" fi rb_cv_dlopen=yes ;; - interix*) : ${LDSHARED="$CC -shared"} + interix*) : ${LDSHARED='$(CC) -shared'} XLDFLAGS="$XLDFLAGS -Wl,-E" LIBPATHFLAG=" -L%1\$-s" rb_cv_dlopen=yes ;; - freebsd*|dragonfly*) : ${LDSHARED="$CC -shared"} + freebsd*|dragonfly*) : ${LDSHARED='$(CC) -shared'} if test "$rb_cv_binary_elf" = yes; then LDFLAGS="$LDFLAGS -rdynamic" DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$(.TARGET)' @@ -1247,7 +1247,7 @@ if test "$with_dln_a_out" != yes; then test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable" fi rb_cv_dlopen=yes ;; - openbsd*) : ${LDSHARED="\$(CC) -shared ${CCDLFLAGS}"} + openbsd*) : ${LDSHARED='$(CC) -shared $(CCDLFLAGS)'} if test "$rb_cv_binary_elf" = yes; then LDFLAGS="$LDFLAGS -Wl,-E" fi @@ -1311,13 +1311,13 @@ if test "$with_dln_a_out" != yes; then : ${LDSHARED='ld -Bshareable -x'} LDFLAGS="$LDFLAGS -L/lib -L/usr/lib -L/usr/local/lib" rb_cv_dlopen=yes;; - cygwin*|mingw*) : ${LDSHARED="${CC} -shared "'$(if $(filter-out -g -g0,$(debugflags)),,-s)'} + cygwin*|mingw*) : ${LDSHARED='$(CC) -shared $(if $(filter-out -g -g0,$(debugflags)),,-s)'} XLDFLAGS="$XLDFLAGS -Wl,--stack,0x02000000,--enable-auto-import" DLDFLAGS="${DLDFLAGS} -Wl,--enable-auto-image-base,--enable-auto-import,--export-all" : ${LIBPATHENV=""} rb_cv_dlopen=yes ;; hiuxmpp) : ${LDSHARED='ld -r'} ;; - atheos*) : ${LDSHARED="$CC -shared"} + atheos*) : ${LDSHARED='$(CC) -shared'} rb_cv_dlopen=yes ;; os2-emx*) LDFLAGS="$LDFLAGS -Zomf" ;; @@ -1325,6 +1325,7 @@ if test "$with_dln_a_out" != yes; then esac AC_MSG_RESULT($rb_cv_dlopen) fi +case " $CPP " in *" $CC "*) CPP=`echo " $CPP " | sed "s| $CC |"' $(CC) |;s/^ *//;s/ *$//'`;; esac case ${RPATHFLAG} in *'%1$'*) : ${LIBPATHFLAG=' -L%1$-s'};; @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.8" -#define RUBY_RELEASE_DATE "2010-03-22" +#define RUBY_RELEASE_DATE "2010-03-24" #define RUBY_VERSION_CODE 188 -#define RUBY_RELEASE_CODE 20100322 +#define RUBY_RELEASE_CODE 20100324 #define RUBY_PATCHLEVEL -1 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 8 #define RUBY_RELEASE_YEAR 2010 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 22 +#define RUBY_RELEASE_DAY 24 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |