Ensure thirdparty libs use host/target vars appropriately

livecodefraser · livecodeian · commit 81f8010c3451 · 2018-06-07T12:45:03.000+01:00
Settings should always be based on the compilation toolset (host or target)
rather than always being the target (as some components are required to be
built for the host when cross-compiling).
diff --git a/libcef/libcef.gyp b/libcef/libcef.gyp
@@ -9,6 +9,8 @@
 		{
 			'target_name': 'libcef_library_wrapper',
 			'type': 'static_library',
+
+			'toolsets': ['host', 'target'],
 			
 			'variables':
 			{
@@ -17,16 +19,22 @@
 			},
 			
 			# OSX, Windows and Linux only
-			'conditions':
+			'target_conditions':
 			[
 				[
-					'OS != "mac" and OS != "win" and OS != "linux"',
+					'not toolset_os in ("mac", "win", "linux")',
 					{
 						'type': 'none',
 					},
 				],
 				[
-					'OS == "win"',
+					'toolset_os == "linux" and not toolset_arch in ("x86", "x86_64")',
+					{
+						'type': 'none',
+					},
+				],
+				[
+					'toolset_os == "win"',
 					{
 						'defines':
 						[
@@ -262,17 +270,19 @@
 			'target_name': 'libcef_stubs',
 			'type': 'static_library',
 			
+			'toolsets': ['host', 'target'],
+
 			'variables':
 			{
 				'library_for_module': 1,
 				'silence_warnings': 1,
 			},
 			
 			# OSX, Windows and Linux only
-			'conditions':
+			'target_conditions':
 			[
 				[
-					'OS != "mac" and OS != "win" and OS != "linux"',
+					'not toolset_os in ("mac", "win", "linux")',
 					{
 						'type': 'none',
 					},
diff --git a/libexpat/libexpat.gyp b/libexpat/libexpat.gyp
@@ -9,6 +9,8 @@
 		{
 			'target_name': 'libexpat',
 			'type': 'static_library',
+
+			'toolsets': ['host', 'target'],
 			
 			'variables':
 			{
@@ -58,10 +60,10 @@
 				],
 			},
 			
-			'conditions':
+			'target_conditions':
 			[
 				[
-					'OS != "android"',
+					'toolset_os != "android"',
 					{
 						'type': 'none',
 					},
diff --git a/libffi/libffi.gyp b/libffi/libffi.gyp
@@ -284,7 +284,7 @@
 					},
 				],
 				[
-					'(toolset_os == "linux" or toolset_os == "android") and (toolset_arch == "armv6" or toolset_arch == "armv6hf")',
+					'toolset_os in ("linux", "android") and toolset_arch in ("armv6", "armv6hf", "armv7")',
 					{
 						'platform_include_dirs':
 						[
@@ -297,11 +297,19 @@
 							'<@(libffi_generic_sources)'
 						],
 						
-						# Disable VFP
-						'cflags':
-						[
-							'-U__ARM_EABI__',
-						],
+						# Disable VFP for non-hard-float targets
+                        'conditions':
+                        [
+                            [
+                                'toolset_arch == "armv6"',
+                                {
+                                    'cflags':
+                                    [
+                                        '-U__ARM_EABI__',
+                                    ],
+                                },
+                            ],
+                        ],
 					},
 				],
 				[
diff --git a/libgif/libgif.gyp b/libgif/libgif.gyp
@@ -9,6 +9,8 @@
 		{
 			'target_name': 'libgif',
 			
+			'toolsets': ['host', 'target'],
+
 			'conditions':
 			[
 				[
diff --git a/libjpeg/libjpeg.gyp b/libjpeg/libjpeg.gyp
@@ -8,6 +8,8 @@
 	[
 		{
 			'target_name': 'libjpeg',
+
+			'toolsets': ['host', 'target'],
 			
 			'conditions':
 			[
diff --git a/libpcre/libpcre.gyp b/libpcre/libpcre.gyp
@@ -9,6 +9,8 @@
 		{
 			'target_name': 'libpcre',
 			
+			'toolsets': ['host', 'target'],
+
 			'conditions':
 			[
 				[
diff --git a/libpng/libpng.gyp b/libpng/libpng.gyp
@@ -9,6 +9,8 @@
 		{
 			'target_name': 'libpng',
 			
+			'toolsets': ['host', 'target'],
+
 			'dependencies':
 			[
 				'../libz/libz.gyp:libz',
diff --git a/libskia/libskia.gyp b/libskia/libskia.gyp

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@`
`9`	`9`	`{`
`10`	`10`	`'target_name': 'libcef_library_wrapper',`
`11`	`11`	`'type': 'static_library',`
	`12`	`+`
	`13`	`+ 'toolsets': ['host', 'target'],`
`12`	`14`
`13`	`15`	`'variables':`
`14`	`16`	`{`
`@@ -17,16 +19,22 @@`
`17`	`19`	`},`
`18`	`20`
`19`	`21`	`# OSX, Windows and Linux only`
`20`		`- 'conditions':`
	`22`	`+ 'target_conditions':`
`21`	`23`	`[`
`22`	`24`	`[`
`23`		`- 'OS != "mac" and OS != "win" and OS != "linux"',`
	`25`	`+ 'not toolset_os in ("mac", "win", "linux")',`
`24`	`26`	`{`
`25`	`27`	`'type': 'none',`
`26`	`28`	`},`
`27`	`29`	`],`
`28`	`30`	`[`
`29`		`- 'OS == "win"',`
	`31`	`+ 'toolset_os == "linux" and not toolset_arch in ("x86", "x86_64")',`
	`32`	`+ {`
	`33`	`+ 'type': 'none',`
	`34`	`+ },`
	`35`	`+ ],`
	`36`	`+ [`
	`37`	`+ 'toolset_os == "win"',`
`30`	`38`	`{`
`31`	`39`	`'defines':`
`32`	`40`	`[`
`@@ -262,17 +270,19 @@`
`262`	`270`	`'target_name': 'libcef_stubs',`
`263`	`271`	`'type': 'static_library',`
`264`	`272`
	`273`	`+ 'toolsets': ['host', 'target'],`
	`274`	`+`
`265`	`275`	`'variables':`
`266`	`276`	`{`
`267`	`277`	`'library_for_module': 1,`
`268`	`278`	`'silence_warnings': 1,`
`269`	`279`	`},`
`270`	`280`
`271`	`281`	`# OSX, Windows and Linux only`
`272`		`- 'conditions':`
	`282`	`+ 'target_conditions':`
`273`	`283`	`[`
`274`	`284`	`[`
`275`		`- 'OS != "mac" and OS != "win" and OS != "linux"',`
	`285`	`+ 'not toolset_os in ("mac", "win", "linux")',`
`276`	`286`	`{`
`277`	`287`	`'type': 'none',`
`278`	`288`	`},`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@`
`8`	`8`	`[`
`9`	`9`	`{`
`10`	`10`	`'target_name': 'libjpeg',`
	`11`	`+`
	`12`	`+ 'toolsets': ['host', 'target'],`
`11`	`13`
`12`	`14`	`'conditions':`
`13`	`15`	`[`