Mercurial > vim
diff src/configure.ac @ 24321:aa4342593469 v8.2.2701
patch 8.2.2701: order of removing FORTIFY_SOURCE is wrong
Commit: https://github.com/vim/vim/commit/26f201345dadef2a048db5aea804f6c1b54f1a0b
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Apr 3 17:33:52 2021 +0200
patch 8.2.2701: order of removing FORTIFY_SOURCE is wrong
Problem: Order of removing FORTIFY_SOURCE is wrong.
Solution: Use the more specific pattern first.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 03 Apr 2021 17:45:04 +0200 |
| parents | c5cb45fc82d3 |
| children | 09bfa6e3859c |
line wrap: on
line diff
--- a/src/configure.ac +++ b/src/configure.ac @@ -4484,8 +4484,8 @@ if test "$GCC" = yes; then dnl And undefine it first to avoid a warning. AC_MSG_CHECKING(whether we need -D_FORTIFY_SOURCE=1) if test "$gccmajor" -gt "3"; then - CFLAGS=`echo "$CFLAGS" | sed -e 's/-D_FORTIFY_SOURCE=.,//g' -e 's/,-D_FORTIFY_SOURCE=. //g' -e 's/ *-Wp,-D_FORTIFY_SOURCE=. //g' -e 's/ *-D_FORTIFY_SOURCE=.//g' -e 's/ *-U_FORTIFY_SOURCE//g' -e 's/$/ -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1/'` - CPPFLAGS=`echo "$CPPFLAGS" | sed -e 's/-D_FORTIFY_SOURCE=.,//g' -e 's/,-D_FORTIFY_SOURCE=. //g' -e 's/ *-Wp,-D_FORTIFY_SOURCE=. //g' -e 's/ *-D_FORTIFY_SOURCE=.//g' -e 's/ *-U_FORTIFY_SOURCE//g'` + CFLAGS=`echo "$CFLAGS" | sed -e 's/-D_FORTIFY_SOURCE=.,//g' -e 's/ *-Wp,-D_FORTIFY_SOURCE=. / /g' -e 's/,-D_FORTIFY_SOURCE=. //g' -e 's/ *-D_FORTIFY_SOURCE=.//g' -e 's/ *-U_FORTIFY_SOURCE//g' -e 's/$/ -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1/'` + CPPFLAGS=`echo "$CPPFLAGS" | sed -e 's/-D_FORTIFY_SOURCE=.,//g' -e 's/ *-Wp,-D_FORTIFY_SOURCE=. / /g' -e 's/,-D_FORTIFY_SOURCE=. //g' -e 's/ *-D_FORTIFY_SOURCE=.//g' -e 's/ *-U_FORTIFY_SOURCE//g'` AC_MSG_RESULT(yes) else AC_MSG_RESULT(no)