diff options
| author | jstebbins <[email protected]> | 2011-07-11 15:36:16 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2011-07-11 15:36:16 +0000 |
| commit | 5cade70aad41cdf2a311a316dee1738c0dd6b0dc (patch) | |
| tree | 4aa08429ba9b5a87002d5d495915abdeee862949 | |
| parent | a98fe961eaa65a0aeb9a8e358890d746c700b26a (diff) | |
build: fix configure to define GCC.O before including main.defs
This is needed so that contrib makefiles can see it's value.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4099 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | make/configure.py | 4 | ||||
| -rw-r--r-- | make/include/gcc.defs | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/make/configure.py b/make/configure.py index faeab42a6..df9e853a5 100644 --- a/make/configure.py +++ b/make/configure.py @@ -1483,9 +1483,10 @@ int main () doc.add( 'HAS.iconv', 1 ) doc.addMake( '' ) - doc.addMake( '## define debug mode before other includes' ) + doc.addMake( '## define debug mode and optimize before other includes' ) doc.addMake( '## since it is tested in some module.defs' ) doc.add( 'GCC.g', debugMode.mode ) + doc.add( 'GCC.O', optimizeMode.mode ) doc.addBlank() doc.addMake( '## include definitions' ) doc.addMake( 'include $(SRC/)make/include/main.defs' ) @@ -1509,7 +1510,6 @@ int main () doc.add( 'GCC.minver', '' ) doc.add( 'GCC.ldsysroot', '$(GCC.sysroot)' ) doc.add( 'GCC.ldminver', '$(GCC.minver)' ) - doc.add( 'GCC.O', optimizeMode.mode ) if options.enable_asm and not Tools.yasm.fail: asm = '' diff --git a/make/include/gcc.defs b/make/include/gcc.defs index c9b82e70a..c93d0babd 100644 --- a/make/include/gcc.defs +++ b/make/include/gcc.defs @@ -17,7 +17,9 @@ GCC.pic = 0 ifndef GCC.g GCC.g = none endif -GCC.O = none +ifndef GCC.O + GCC.O = none +endif GCC.D = GCC.I = GCC.muldefs = 0 |