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

diff --git a/make/configure.py b/make/configure.py
index faeab42a6666badb1cb064ef7a0b0ef50321a7c3..df9e853a51d38e7deb36f467ac660bc31590b7d9 100644 (file)
--- 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 c9b82e70a2309dd00dbb2e40f64de8b2ea5fd54e..c93d0babd202f1630f83c4827eca11e43443f1e3 100644 (file)
--- 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