Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

merge revision(s) 34840:

	* configure.in (debugflags): check if -ggdb is accepted.
	  [ruby-core:42875][Bug #6080]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34841 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
commit ffdaca1d748804f2b5ca2de612f17cf6c78d351b 1 parent e9ef9bd
Nobuyoshi Nakada authored February 28, 2012
5  ChangeLog
... ...
@@ -1,3 +1,8 @@
  1
+Tue Feb 28 11:56:52 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
  2
+
  3
+	* configure.in (debugflags): check if -ggdb is accepted.
  4
+	  [ruby-core:42875][Bug #6080]
  5
+
1 6
 Mon Feb 27 17:25:40 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
2 7
 
3 8
 	* ext/bigdecimal/bigdecimal.c (GetVpValueWithPrec): since methods
8  configure.in
@@ -288,12 +288,10 @@ AC_SUBST(GCC)
288 288
 if test "$GCC" = yes; then
289 289
     linker_flag=-Wl,
290 290
     : ${optflags=-O3}
291  
-    AS_CASE(["$target_os"], [linux*|darwin*], [: ${debugflags=-ggdb}])
292 291
     RUBY_APPEND_OPTIONS(XCFLAGS, ["-include ruby/config.h" "-include ruby/missing.h"])
293 292
 else
294 293
     linker_flag=
295 294
 fi
296  
-test $ac_cv_prog_cc_g = yes && : ${debugflags=-g}
297 295
 
298 296
 RUBY_PROG_GNU_LD
299 297
 RUBY_CPPOUTFILE
@@ -487,6 +485,12 @@ if test "$GCC:${warnflags+set}:no" = yes::no; then
487 485
     rb_cv_warnflags="$warnflags"
488 486
     warnflags=
489 487
 fi
  488
+if test "$GCC" = yes; then
  489
+    test "${debugflags+set}" || {RUBY_TRY_CFLAGS(-ggdb, [debugflags=-ggdb])}
  490
+    test "${debugflags+set}" || {RUBY_TRY_CFLAGS(-g3, [debugflags=-g3])}
  491
+fi
  492
+test $ac_cv_prog_cc_g = yes && : ${debugflags=-g}
  493
+
490 494
 if test "$GCC" = ""; then
491 495
     AS_CASE(["$target_os"],[aix*],[warnflags="-qinfo=por"])
492 496
 fi
6  version.h
... ...
@@ -1,10 +1,10 @@
1 1
 #define RUBY_VERSION "1.9.3"
2  
-#define RUBY_PATCHLEVEL 152
  2
+#define RUBY_PATCHLEVEL 153
3 3
 
4  
-#define RUBY_RELEASE_DATE "2012-02-27"
  4
+#define RUBY_RELEASE_DATE "2012-02-28"
5 5
 #define RUBY_RELEASE_YEAR 2012
6 6
 #define RUBY_RELEASE_MONTH 2
7  
-#define RUBY_RELEASE_DAY 27
  7
+#define RUBY_RELEASE_DAY 28
8 8
 
9 9
 #include "ruby/version.h"
10 10
 

0 notes on commit ffdaca1

Please sign in to comment.
Something went wrong with that request. Please try again.