diff options
| author | Alex Smith <alex.smith@warpsharp.info> | 2015-09-26 02:15:24 -0400 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-09-27 00:06:22 +0200 |
| commit | 20b079963bf8985c2b7d85452426593bd5d10b9e (patch) | |
| tree | e20676acbcb927741a954f3ec656c131c6eb062f | |
| parent | ad9a543e9351d940a53450f793458664c8a74a73 (diff) | |
| download | ffmpeg-20b079963bf8985c2b7d85452426593bd5d10b9e.tar.gz | |
configure: Combine dynamicbase and nxcompat checks
They were added to binutils in the same version so it's safe to combine.
Signed-off-by: Alex Smith <theryuu@warpsharp.info>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rwxr-xr-x | configure | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -4367,8 +4367,6 @@ case $target_os in LIBTARGET=arm-wince fi enabled shared && ! enabled small && check_cmd $windres --version && enable gnu_windres - check_ldflags -Wl,--nxcompat - check_ldflags -Wl,--dynamicbase enabled x86_32 && check_ldflags -Wl,--large-address-aware shlibdir_default="$bindir_default" SLIBPREF="" @@ -4392,6 +4390,7 @@ case $target_os in objformat="win32" ranlib=: enable dos_paths + check_ldflags -Wl,--nxcompat,--dynamicbase # Lets work around some stupidity in binutils. # ld will strip relocations from executables even though we need them # for dynamicbase (ASLR). Using -pie does retain the reloc section |