diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | configure.in | 11 |
2 files changed, 19 insertions, 2 deletions
@@ -1,3 +1,13 @@ +Sat Feb 23 13:00:07 2013 Akinori MUSHA <knu@iDaemons.org> + + * configure.in: Fix a bug introduced in r38342 that the cflagspat + substitution is messed up by the way CFLAGS and optflags are + modified, which affected FreeBSD and NetBSD/amd64 when + configured to use libexecinfo. This bug resulted in CFLAGS and + CXXFLAGS in RbConfig::CONFIG having warnflags expanded in them, + forcing third-party C/C++ extensions to follow what warnflags + demands, like ANSI/ISO-C90 conformance. ref [Bug #7101] + Sat Feb 23 12:58:32 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/mkmf.rb: remove extra topdir in VPATH, which was in diff --git a/configure.in b/configure.in index 19b9b40039..48eac465e6 100644 --- a/configure.in +++ b/configure.in @@ -2389,8 +2389,15 @@ AS_CASE(["$target_cpu-$target_os"], execinfo_frame_pointer=no RUBY_TRY_CFLAGS(-fno-omit-frame-pointer, [execinfo_frame_pointer=yes]) if test "x$execinfo_frame_pointer" = xyes; then - optflags="${optflags+$optflags }-fno-omit-frame-pointer" - CFLAGS="$CFLAGS -fno-omit-frame-pointer" + # optflags must be manipulated very carefully. For the + # later cflagspat/cxxflagspat substitution to work, CFLAGS + # and CXXFLAGS must start exactly with the value of + # optflags. + CFLAGS="${CFLAGS# }"; CFLAGS="${CFLAGS#"$optflags "}" + CXXFLAGS="${CXXFLAGS# }"; CXXFLAGS="${CXXFLAGS#"$optflags "}" + RUBY_APPEND_OPTION(optflags, -fno-omit-frame-pointer) + CFLAGS=" $optflags $CFLAGS" + CXXFLAGS=" $optflags $CXXFLAGS" fi fi]) AC_CHECK_FUNCS(backtrace) |