ruby-changes:22792
From: nobu <ko1@a...>
Date: Tue, 28 Feb 2012 11:57:10 +0900 (JST)
Subject: [ruby-changes:22792] nobu:r34841 (ruby_1_9_3): merge revision(s) 34840:
nobu 2012-02-28 11:56:59 +0900 (Tue, 28 Feb 2012) New Revision: 34841 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34841 Log: merge revision(s) 34840: * configure.in (debugflags): check if -ggdb is accepted. [ruby-core:42875][Bug #6080] Modified files: branches/ruby_1_9_3/ChangeLog branches/ruby_1_9_3/configure.in branches/ruby_1_9_3/version.h Index: ruby_1_9_3/configure.in =================================================================== --- ruby_1_9_3/configure.in (revision 34840) +++ ruby_1_9_3/configure.in (revision 34841) @@ -288,12 +288,10 @@ if test "$GCC" = yes; then linker_flag=-Wl, : ${optflags=-O3} - AS_CASE(["$target_os"], [linux*|darwin*], [: ${debugflags=-ggdb}]) RUBY_APPEND_OPTIONS(XCFLAGS, ["-include ruby/config.h" "-include ruby/missing.h"]) else linker_flag= fi -test $ac_cv_prog_cc_g = yes && : ${debugflags=-g} RUBY_PROG_GNU_LD RUBY_CPPOUTFILE @@ -487,6 +485,12 @@ rb_cv_warnflags="$warnflags" warnflags= fi +if test "$GCC" = yes; then + test "${debugflags+set}" || {RUBY_TRY_CFLAGS(-ggdb, [debugflags=-ggdb])} + test "${debugflags+set}" || {RUBY_TRY_CFLAGS(-g3, [debugflags=-g3])} +fi +test $ac_cv_prog_cc_g = yes && : ${debugflags=-g} + if test "$GCC" = ""; then AS_CASE(["$target_os"],[aix*],[warnflags="-qinfo=por"]) fi Index: ruby_1_9_3/ChangeLog =================================================================== --- ruby_1_9_3/ChangeLog (revision 34840) +++ ruby_1_9_3/ChangeLog (revision 34841) @@ -1,3 +1,8 @@ +Tue Feb 28 11:56:52 2012 Nobuyoshi Nakada <nobu@r...> + + * configure.in (debugflags): check if -ggdb is accepted. + [ruby-core:42875][Bug #6080] + Mon Feb 27 17:25:40 2012 Nobuyoshi Nakada <nobu@r...> * ext/bigdecimal/bigdecimal.c (GetVpValueWithPrec): since methods Index: ruby_1_9_3/version.h =================================================================== --- ruby_1_9_3/version.h (revision 34840) +++ ruby_1_9_3/version.h (revision 34841) @@ -1,10 +1,10 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 152 +#define RUBY_PATCHLEVEL 153 -#define RUBY_RELEASE_DATE "2012-02-27" +#define RUBY_RELEASE_DATE "2012-02-28" #define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 27 +#define RUBY_RELEASE_DAY 28 #include "ruby/version.h" -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/