Mercurial > vim
comparison 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 |
comparison
equal
deleted
inserted
replaced
24320:d44753831812 | 24321:aa4342593469 |
---|---|
4482 dnl declared as char x[1] but actually longer. Introduced in gcc 4.0. | 4482 dnl declared as char x[1] but actually longer. Introduced in gcc 4.0. |
4483 dnl Also remove duplicate _FORTIFY_SOURCE arguments. | 4483 dnl Also remove duplicate _FORTIFY_SOURCE arguments. |
4484 dnl And undefine it first to avoid a warning. | 4484 dnl And undefine it first to avoid a warning. |
4485 AC_MSG_CHECKING(whether we need -D_FORTIFY_SOURCE=1) | 4485 AC_MSG_CHECKING(whether we need -D_FORTIFY_SOURCE=1) |
4486 if test "$gccmajor" -gt "3"; then | 4486 if test "$gccmajor" -gt "3"; then |
4487 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/'` | 4487 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/'` |
4488 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'` | 4488 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'` |
4489 AC_MSG_RESULT(yes) | 4489 AC_MSG_RESULT(yes) |
4490 else | 4490 else |
4491 AC_MSG_RESULT(no) | 4491 AC_MSG_RESULT(no) |
4492 fi | 4492 fi |
4493 fi | 4493 fi |