diff options
| author | jstebbins <[email protected]> | 2011-07-11 18:19:51 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2011-07-11 18:19:51 +0000 |
| commit | 4364fd9ba6dc63b4a7c75cfcb25637ae5c4d5ee5 (patch) | |
| tree | db719f4c79f699bbb07ba4542b7b5aa3ff5e1a2b /make | |
| parent | 8afaff770fe5e5a3ce67f778aa712eeb8954252b (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 'make')
| -rw-r--r-- | make/include/contrib.defs | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/make/include/contrib.defs b/make/include/contrib.defs index 0e158cd67..003152b85 100644 --- a/make/include/contrib.defs +++ b/make/include/contrib.defs @@ -83,9 +83,22 @@ define import.CONTRIB.defs $(1).CONFIGURE.args = !sete @dir !bootstrap !env !exe @host @prefix !deps !shared !static !extra $(1).CONFIGURE.env.CC = CC=$$($(1).GCC.gcc) - $(1).CONFIGURE.env.CFLAGS = CFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra)" $(1).CONFIGURE.env.CXX = CXX=$$($(1).GCC.gxx) - $(1).CONFIGURE.env.CXXFLAGS = CXXFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra)" + ## + ## Only add debug and optimization flags to contribs when + ## debug=max or optimizations=none. Otherwise, use the contribs defaults + ifeq (max,$$($(1).GCC.g)) + ifeq (none,$$($(1).GCC.O)) + $(1).CONFIGURE.env.CFLAGS = CFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra .g .O)" + $(1).CONFIGURE.env.CXXFLAGS = CXXFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra .g .O)" + else + $(1).CONFIGURE.env.CFLAGS = CFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra .g)" + $(1).CONFIGURE.env.CXXFLAGS = CXXFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra .g)" + endif + else + $(1).CONFIGURE.env.CFLAGS = CFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra)" + $(1).CONFIGURE.env.CXXFLAGS = CXXFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra)" + endif $(1).CONFIGURE.env.CPPFLAGS = CPPFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra)" $(1).CONFIGURE.env.LDFLAGS = LDFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver)" $(1).CONFIGURE.env.PKG_CONFIG_PATH = PKG_CONFIG_PATH="$$(call fn.ABSOLUTE,$$(CONTRIB.build/))lib/pkgconfig" |