[[ Gyp ]] Update the lc-compile toolchain to use silence_warnings

livecodefraser · livecodefraser · commit 4bd69bbad9b1 · 2015-07-21T13:53:58.000+01:00
diff --git a/common.gypi b/common.gypi
@@ -10,7 +10,6 @@
 		'config/perl.gypi',
 		'config/target_os.gypi',
 		'config/thirdparty.gypi',
-		'config/warnings.gypi',
 		'config/yacc.gypi',
 	],
 }
diff --git a/config/android-settings.gypi b/config/android-settings.gypi
@@ -1,8 +1,6 @@
 {
 	'cflags':
 	[
-		'-Wall',
-		'-Wextra',
 		'-fstrict-aliasing',
 		'-fvisibility=hidden',
 	],
@@ -42,6 +40,7 @@
 				[
 					'-w',						# Disable warnings
 					'-fpermissive',				# Be more lax with old code
+					'-Wno-return-type',
 				],
 			},
 		],
diff --git a/config/ios.gypi b/config/ios.gypi
@@ -196,6 +196,11 @@
 					'xcode_settings':
 					{
 						'GCC_INHIBIT_ALL_WARNINGS': 'YES',
+
+						'WARNING_CFLAGS':
+						[
+							'-Wno-return-type',
+						],
 					},
 				},
 			],
diff --git a/config/linux-settings.gypi b/config/linux-settings.gypi
@@ -8,9 +8,7 @@
 		'exe_suffix': '',
 		'debug_info_suffix': '.dbg',
 		
-		'c++_std': '<!(echo ${CXX_STD:-gnu++03})',
-		
-		'silence_warnings': 0,
+		'c++_std': '<!(echo ${CXX_STD:-c++03})',
 	},
 	
 	'defines':
@@ -77,6 +75,7 @@
 				[
 					'-w',						# Disable warnings
 					'-fpermissive',				# Be more lax with old code
+					'-Wno-return-type',
 				],
 				
 				'cflags_c':
@@ -89,8 +88,6 @@
 	
 	'cflags':
 	[
-		'-Wall',
-		'-Wextra',
 		'-fstrict-aliasing',
 		'-fvisibility=hidden',
 	],
diff --git a/config/linux.gypi b/config/linux.gypi
@@ -11,6 +11,11 @@
 	
 	'target_defaults':
 	{
+		'variables':
+		{
+			'silence_warnings': 0,
+		},
+
 		'includes':
 		[
 			'linux-settings.gypi',
diff --git a/config/mac.gypi b/config/mac.gypi
@@ -126,6 +126,10 @@
 					'xcode_settings':
 					{
 						'GCC_INHIBIT_ALL_WARNINGS': 'YES',
+						'WARNING_CFLAGS':
+						[
+							'-Wno-return-type',
+						],
 					},
 				},
 			],
diff --git a/config/warnings.gypi b/config/warnings.gypi
diff --git a/toolchain/gentle/gentle/gentle.gyp b/toolchain/gentle/gentle/gentle.gyp
@@ -12,10 +12,13 @@
 			
 			'toolsets': ['host','target'],
 			
-			'suppress_warnings': 1,
-			
 			'product_name': 'gentle-<(_toolset)',
-			
+		
+			'variables':
+			{
+				'silence_warnings': 1,
+			},
+	
 			'dependencies':
 			[ 
 				'./grts.gyp:grts'
diff --git a/toolchain/gentle/gentle/grts.gyp b/toolchain/gentle/gentle/grts.gyp
@@ -12,10 +12,13 @@
 			
 			'toolsets': ['host','target'],
 			
-			'suppress_warnings': 1,
-			
 			'product_name': 'grts',
-			
+		
+			'variables':
+			{
+				'silence_warnings': 1,
+			},
+	
 			'sources':
 			[
 				'grts.c',
diff --git a/toolchain/gentle/reflex/reflex.gyp b/toolchain/gentle/reflex/reflex.gyp
@@ -12,10 +12,13 @@
 			
 			'toolsets': ['host','target'],
 			
-			'suppress_warnings': 1,
-			
 			'product_name': 'reflex-<(_toolset)',
-			
+		
+			'variables':
+			{
+				'silence_warnings': 1,
+			},
+	
 			'direct_dependent_settings':
 			{
 				'variables':
diff --git a/toolchain/lc-compile/src/lc-compile-bootstrap-common.gypi b/toolchain/lc-compile/src/lc-compile-bootstrap-common.gypi
@@ -1,6 +1,9 @@
 {
-	'suppress_warnings': 1,
-	
+	'variables':
+	{
+		'silence_warnings': 1,
+	},
+
 	'direct_dependent_settings':
 	{
 		'variables':
diff --git a/toolchain/lc-compile/src/lc-compile-bootstrap.gyp b/toolchain/lc-compile/src/lc-compile-bootstrap.gyp
@@ -169,13 +169,12 @@
 			
 			'toolsets': ['host','target'],
 
-			'suppress_warnings': 1,
-
 			'product_name': 'lc-bootstrap-compile-<(_toolset)',
-			
+		
 			'variables':
 			{
 				'stage': 'stage1',
+				'silence_warnings': 1,
 			},
 			
 			'direct_dependent_settings':

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@`
`10`	`10`	`'config/perl.gypi',`
`11`	`11`	`'config/target_os.gypi',`
`12`	`12`	`'config/thirdparty.gypi',`
`13`		`- 'config/warnings.gypi',`
`14`	`13`	`'config/yacc.gypi',`
`15`	`14`	`],`
`16`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`'cflags':`
`3`	`3`	`[`
`4`		`- '-Wall',`
`5`		`- '-Wextra',`
`6`	`4`	`'-fstrict-aliasing',`
`7`	`5`	`'-fvisibility=hidden',`
`8`	`6`	`],`
`@@ -42,6 +40,7 @@`
`42`	`40`	`[`
`43`	`41`	`'-w', # Disable warnings`
`44`	`42`	`'-fpermissive', # Be more lax with old code`
	`43`	`+ '-Wno-return-type',`
`45`	`44`	`],`
`46`	`45`	`},`
`47`	`46`	`],`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,11 @@`
`11`	`11`
`12`	`12`	`'target_defaults':`
`13`	`13`	`{`
	`14`	`+ 'variables':`
	`15`	`+ {`
	`16`	`+ 'silence_warnings': 0,`
	`17`	`+ },`
	`18`	`+`
`14`	`19`	`'includes':`
`15`	`20`	`[`
`16`	`21`	`'linux-settings.gypi',`