summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-10-12 14:58:34 -0300
committerJames Almer <jamrial@gmail.com>2017-10-12 14:58:34 -0300
commite4ad3e6f6449f41685d0a640a06c24202c3b5a6e (patch)
tree8101dcaff577eae5baa600cb483be97df1d12399 /configure
parent6fb580e7d3c4cead297620a7b982b2975c56b166 (diff)
parent808ef43597b1e3d6e69a5b9abe2237c8ddb97b44 (diff)
downloadffmpeg-streaming-e4ad3e6f6449f41685d0a640a06c24202c3b5a6e.zip
ffmpeg-streaming-e4ad3e6f6449f41685d0a640a06c24202c3b5a6e.tar.gz
Merge commit '808ef43597b1e3d6e69a5b9abe2237c8ddb97b44'
* commit '808ef43597b1e3d6e69a5b9abe2237c8ddb97b44': build: Explicitly set 32-bit/64-bit object formats for nasm/yasm See d44935cbf4e42e842c11b1eeeaa28377dc8fd6d2 Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure1
1 files changed, 0 insertions, 1 deletions
diff --git a/configure b/configure
index 6deef0a..7a1f4ba 100755
--- a/configure
+++ b/configure
@@ -5032,7 +5032,6 @@ case $target_os in
SLIBSUF=".dylib"
SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME).$(LIBVERSION)$(SLIBSUF)'
SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME).$(LIBMAJOR)$(SLIBSUF)'
- objformat="macho"
enabled x86_64 && objformat="macho64" || objformat="macho32"
enabled_any pic shared x86_64 ||
{ check_cflags -mdynamic-no-pic && add_asflags -mdynamic-no-pic; }
OpenPOWER on IntegriCloud