summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-11-27 07:15:04 +0000
committerkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-11-27 07:15:04 +0000
commita4d38daecef8729cd1b61de6bc02cfbfd68f18fe (patch)
tree6f79e09dde55ac701f3374e13c355c3a776b8c7d
parent63e65fd4b10630484fe563eee1443332465cabe5 (diff)
* configure.in: add -fstack-protector into XLDFLAGS as well as
XCFLAGS if stack-protector is used. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33863 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--configure.in3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2b8d4cab05..a377d169a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Nov 27 14:13:33 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * configure.in: add -fstack-protector into XLDFLAGS as well as
+ XCFLAGS if stack-protector is used.
+
Sun Nov 27 13:09:25 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* configure.in: workaround to avoid MacOS X build error.
diff --git a/configure.in b/configure.in
index 04e0c556dd..3a812b99cd 100644
--- a/configure.in
+++ b/configure.in
@@ -497,7 +497,8 @@ if test "$GCC:${warnflags+set}:no" = yes::no; then
fi
if test "$GCC" = yes; then
RUBY_TRY_CFLAGS(-D_FORTIFY_SOURCE=2, [RUBY_APPEND_OPTION(XCFLAGS, -D_FORTIFY_SOURCE=2)])
- RUBY_TRY_CFLAGS(-fstack-protector, [RUBY_APPEND_OPTION(XCFLAGS, -fstack-protector)])
+ RUBY_TRY_CFLAGS(-fstack-protector, [RUBY_APPEND_OPTION(XCFLAGS, -fstack-protector)
+ RUBY_APPEND_OPTION(XLDFLAGS, -fstack-protector)])
fi
if test "$GCC" = ""; then