summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--make/configure.py4
-rw-r--r--make/include/gcc.defs4
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