summaryrefslogtreecommitdiffstats
path: root/contrib/ffmpeg
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2011-07-11 18:19:51 +0000
committerjstebbins <[email protected]>2011-07-11 18:19:51 +0000
commit4364fd9ba6dc63b4a7c75cfcb25637ae5c4d5ee5 (patch)
treedb719f4c79f699bbb07ba4542b7b5aa3ff5e1a2b /contrib/ffmpeg
parent8afaff770fe5e5a3ce67f778aa712eeb8954252b (diff)
contrib: enable debuggin when debug=max and disable optimizations when optimizations=none
except for ffmpeg on darwin i386 which fails to build when optimizations are disabled due to gcc running out of registers. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4103 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib/ffmpeg')
-rw-r--r--contrib/ffmpeg/module.defs10
1 files changed, 8 insertions, 2 deletions
diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs
index eb66a4607..90cbd5c75 100644
--- a/contrib/ffmpeg/module.defs
+++ b/contrib/ffmpeg/module.defs
@@ -48,15 +48,21 @@ else
FFMPEG.CONFIGURE.extra += --enable-pthreads
endif
-ifneq (max,$(GCC.g))
+ifneq (max,$(FFMPEG.GCC.g))
FFMPEG.CONFIGURE.extra += --disable-debug
else
FFMPEG.CONFIGURE.extra += --enable-debug
endif
-ifeq (none,$(GCC.O))
+ifeq (none,$(FFMPEG.GCC.O))
+#
+# gcc on darwin i386 fails to find enough registers when
+# optimizations are disabled
+#
+ifneq (darwin-i386,$(BUILD.system)-$(BUILD.machine))
FFMPEG.CONFIGURE.extra += --disable-optimizations
endif
+endif
#
# MPC8 Doesn't compile on SPARC