1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

merge revision(s) a7b9f085ff952fcb18f82de39b3bf9ab7e5ba3e7,9165fcdfa309052a2adc3c6100ab24204de6c2d1,e42d9d8df87f58b9bfa65647249822df25851375: [Backport #16401]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67897 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2021-02-28 14:14:25 +00:00
parent aa3dda8bce
commit c64fbfae6f
2 changed files with 14 additions and 2 deletions

View file

@ -552,7 +552,19 @@ AS_IF([test "$GCC" = yes], [
# argument check. The performance drop is very little and Ubuntu enables
# _FORTIFY_SOURCE=2 by default. So, let's support it for protecting us from
# a mistake of silly C extensions.
RUBY_TRY_CFLAGS(-D_FORTIFY_SOURCE=2, [RUBY_APPEND_OPTION(XCFLAGS, -D_FORTIFY_SOURCE=2)])
# TODO: check if link succeeds with _FORTIFY_SOURCE=2.
AS_CASE(["$target_os"],
[mingw*], [
fortify_source=no
])
AC_ARG_ENABLE(fortify_source,
AS_HELP_STRING([--disable-fortify-source],
[disable -D_FORTIFY_SOURCE=2 option, which causes link error on mingw]),
[fortify_source=$enableval])
AS_IF([test "x$fortify_source" != xno], [
RUBY_TRY_CFLAGS(-D_FORTIFY_SOURCE=2, [RUBY_APPEND_OPTION(XCFLAGS, -D_FORTIFY_SOURCE=2)])
])
: ${MJIT_HEADER_FLAGS='-P -dD'}

View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.6.7"
#define RUBY_RELEASE_DATE "2021-02-28"
#define RUBY_PATCHLEVEL 156
#define RUBY_PATCHLEVEL 157
#define RUBY_RELEASE_YEAR 2021
#define RUBY_RELEASE_MONTH 2