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 /contrib/fontconfig | |
| 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 'contrib/fontconfig')
| -rw-r--r-- | contrib/fontconfig/module.defs | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/contrib/fontconfig/module.defs b/contrib/fontconfig/module.defs index 5d96593e8..78e819422 100644 --- a/contrib/fontconfig/module.defs +++ b/contrib/fontconfig/module.defs @@ -49,8 +49,19 @@ FONTCONFIG.CONFIGURE.env.CC = CC="$(FONTCONFIG.GCC.gcc) $(FONTCONFIG.cc_ar # The following lines override the original lines in /make/include/contrib.defs, # but have '*archs' removed (and '$(1)' presubstituted for 'FONTCONFIG'). # -FONTCONFIG.CONFIGURE.env.CFLAGS = CFLAGS="$(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra)" -FONTCONFIG.CONFIGURE.env.CXXFLAGS = CXXFLAGS="$(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra)" +ifeq (max,$(FONTCONFIG.GCC.g)) + ifeq (none,$(FONTCONFIG.GCC.O)) + FONTCONFIG.CONFIGURE.env.CFLAGS = CFLAGS="$(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra .g .O)" + FONTCONFIG.CONFIGURE.env.CXXFLAGS = CXXFLAGS="$(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra .g .O)" + else + FONTCONFIG.CONFIGURE.env.CFLAGS = CFLAGS="$(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra .g)" + FONTCONFIG.CONFIGURE.env.CXXFLAGS = CXXFLAGS="$(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra .g)" + endif +else + FONTCONFIG.CONFIGURE.env.CFLAGS = CFLAGS="$(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra)" + FONTCONFIG.CONFIGURE.env.CXXFLAGS = CXXFLAGS="$(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra)" +endif + FONTCONFIG.CONFIGURE.env.CPPFLAGS = CPPFLAGS="$(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver ?extra)" FONTCONFIG.CONFIGURE.env.LDFLAGS = LDFLAGS="$(call fn.ARGS,FONTCONFIG.GCC,*sysroot *minver)" |