[FFmpeg-cvslog] Merge commit '0ca66409911e9fba940424be8bdfa54e056b0a4b'
James Almer
git at videolan.org
Sat Nov 11 21:57:52 EET 2017
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Nov 11 16:56:59 2017 -0300| [ce726e77579363fffa3233a865025a6790c9f924] | committer: James Almer
Merge commit '0ca66409911e9fba940424be8bdfa54e056b0a4b'
* commit '0ca66409911e9fba940424be8bdfa54e056b0a4b':
configure: Don't add -fPIC to asflags when targeting windows
Merged-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ce726e77579363fffa3233a865025a6790c9f924
---
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure b/configure
index f1edf815cf..717ae61e24 100755
--- a/configure
+++ b/configure
@@ -5326,9 +5326,9 @@ enable_weak_pic() {
;;
*)
add_cflags -fPIC
+ add_asflags -fPIC
;;
esac
- add_asflags -fPIC
}
enabled pic && enable_weak_pic
======================================================================
More information about the ffmpeg-cvslog
mailing list