[FFmpeg-cvslog] configure: Combine dynamicbase and nxcompat checks
Alex Smith
git at videolan.org
Sun Sep 27 00:22:00 CEST 2015
ffmpeg | branch: master | Alex Smith <alex.smith at warpsharp.info> | Sat Sep 26 02:15:24 2015 -0400| [20b079963bf8985c2b7d85452426593bd5d10b9e] | committer: Michael Niedermayer
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 at warpsharp.info>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=20b079963bf8985c2b7d85452426593bd5d10b9e
---
configure | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/configure b/configure
index f6bc622..11b6dc4 100755
--- a/configure
+++ b/configure
@@ -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
More information about the ffmpeg-cvslog
mailing list