diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-16 11:57:58 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-16 11:58:40 +0200 |
commit | 5ddfac81c4a9420c4972aea5f36f0400fcb67044 (patch) | |
tree | f37957569c3945f83bb16bc0cd3a5d4d0abf1883 /configure | |
parent | 688a40b4ed7d2e07d3f96c2feecf785a4866e60c (diff) | |
parent | 2d589273dd36c5eb271a035ea0e669b64dae257f (diff) | |
download | ffmpeg-5ddfac81c4a9420c4972aea5f36f0400fcb67044.tar.gz |
Merge commit '2d589273dd36c5eb271a035ea0e669b64dae257f'
* commit '2d589273dd36c5eb271a035ea0e669b64dae257f':
configure: Split adding of CFLAGS and CPPFLAGS for hardened toolchain
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -3036,8 +3036,9 @@ case "$toolchain" in add_ldflags -fprofile-arcs -ftest-coverage ;; hardened) - add_cflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fno-strict-overflow -fstack-protector-all - add_ldflags -Wl,-z,relro -Wl,-z,now + add_cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 + add_cflags -fno-strict-overflow -fstack-protector-all + add_ldflags -Wl,-z,relro -Wl,-z,now ;; ?*) die "Unknown toolchain $toolchain" |