From 4364fd9ba6dc63b4a7c75cfcb25637ae5c4d5ee5 Mon Sep 17 00:00:00 2001
From: jstebbins <jstebbins.hb@gmail.com>
Date: Mon, 11 Jul 2011 18:19:51 +0000
Subject: 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
---
 contrib/ffmpeg/module.defs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'contrib/ffmpeg')

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
-- 
cgit v1.2.3