1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure.in: -g and -fstack-protector flags can't work

Browse Source 
together on SmartOS
* configure.in (stack_protector): control use of -fstack-protector.
* configure.in (debugflags): let -fstack-protector precede and disable
  debugflags, because they can't work together on SmartOS.  [Bug #8268]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40364 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-04-19 02:37:06 +00:00
parent 1f12e40736
commit 526ffc53e9
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
Fri Apr 19 11:36:53 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
together on SmartOS
* configure.in (stack_protector): control use of -fstack-protector.
* configure.in (debugflags): let -fstack-protector precede and disable
debugflags, because they can't work together on SmartOS. [Bug #8268]
Fri Apr 19 07:43:52 2013 NARUSE, Yui <naruse@ruby-lang.org> Fri Apr 19 07:43:52 2013 NARUSE, Yui <naruse@ruby-lang.org>
* test/openssl/test_cipher.rb: Correct a typo * test/openssl/test_cipher.rb: Correct a typo

14
configure.in
View File

@ -705,10 +705,6 @@ if test "$GCC:${warnflags+set}:no" = yes::no; then
warnflags= warnflags=
fi fi
if test "$GCC" = yes; then if test "$GCC" = yes; then
test "${debugflags+set}" || {RUBY_TRY_CFLAGS(-ggdb3, [debugflags=-ggdb3])}
test "${debugflags+set}" || {RUBY_TRY_CFLAGS(-ggdb, [debugflags=-ggdb])}
test "${debugflags+set}" || {RUBY_TRY_CFLAGS(-g3, [debugflags=-g3])}
# -D_FORTIFY_SOURCE # -D_FORTIFY_SOURCE
# When defined _FORTIFY_SOURCE, glibc enables some additional sanity # When defined _FORTIFY_SOURCE, glibc enables some additional sanity
# argument check. The performance drop is very little and Ubuntu enables # argument check. The performance drop is very little and Ubuntu enables
@ -720,13 +716,13 @@ if test "$GCC" = yes; then
AS_CASE(["$target_os"], AS_CASE(["$target_os"],
[mingw*|nacl|haiku], [ [mingw*|nacl|haiku], [
stack_protector=no stack_protector=no
], ])
[ if test -z "${stack_protector+set}"; then
RUBY_TRY_CFLAGS(-fstack-protector, [stack_protector=yes], [stack_protector=no]) RUBY_TRY_CFLAGS(-fstack-protector, [stack_protector=yes], [stack_protector=no])
if test "x$stack_protector" = xyes; then if test "x$stack_protector" = xyes; then
RUBY_TRY_LDFLAGS(-fstack-protector, [], [stack_protector=broken]) RUBY_TRY_LDFLAGS(-fstack-protector, [], [stack_protector=broken])
fi fi
]) fi
if test "x$stack_protector" = xyes; then if test "x$stack_protector" = xyes; then
RUBY_APPEND_OPTION(XCFLAGS, -fstack-protector) RUBY_APPEND_OPTION(XCFLAGS, -fstack-protector)
RUBY_APPEND_OPTION(XLDFLAGS, -fstack-protector) RUBY_APPEND_OPTION(XLDFLAGS, -fstack-protector)
@ -758,6 +754,10 @@ if test "$GCC" = yes; then
# suppress annoying -Wstrict-overflow warnings # suppress annoying -Wstrict-overflow warnings
RUBY_TRY_CFLAGS(-fno-strict-overflow, [RUBY_APPEND_OPTION(XCFLAGS, -fno-strict-overflow)]) RUBY_TRY_CFLAGS(-fno-strict-overflow, [RUBY_APPEND_OPTION(XCFLAGS, -fno-strict-overflow)])
test "${debugflags+set}" || {RUBY_TRY_CFLAGS(-ggdb3, [debugflags=-ggdb3])}
test "${debugflags+set}" || {RUBY_TRY_CFLAGS(-ggdb, [debugflags=-ggdb])}
test "${debugflags+set}" || {RUBY_TRY_CFLAGS(-g3, [debugflags=-g3])}
fi fi
test $ac_cv_prog_cc_g = yes && : ${debugflags=-g} test $ac_cv_prog_cc_g = yes && : ${debugflags=-g}