virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

configure: Combine dynamicbase and nxcompat checks

Browse Source 
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>
This commit is contained in:
Alex Smith
2015-09-26 02:15:24 -04:00
committed by Michael Niedermayer
parent ad9a543e93
commit 20b079963b
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configure vendored
View File

@@ -4367,8 +4367,6 @@ case $target_os in
LIBTARGET=arm-wince LIBTARGET=arm-wince
fi fi
enabled shared && ! enabled small && check_cmd $windres --version && enable gnu_windres 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 enabled x86_32 && check_ldflags -Wl,--large-address-aware
shlibdir_default="$bindir_default" shlibdir_default="$bindir_default"
SLIBPREF="" SLIBPREF=""
@@ -4392,6 +4390,7 @@ case $target_os in
objformat="win32" objformat="win32"
ranlib=: ranlib=:
enable dos_paths enable dos_paths
check_ldflags -Wl,--nxcompat,--dynamicbase
# Lets work around some stupidity in binutils. # Lets work around some stupidity in binutils.
# ld will strip relocations from executables even though we need them # ld will strip relocations from executables even though we need them
# for dynamicbase (ASLR). Using -pie does retain the reloc section # for dynamicbase (ASLR). Using -pie does retain the reloc section