Compile static libraries for externals using '-fPIC' on Linux

livecodefraser · livecodefraser · commit fd50420f54ba · 2015-03-31T15:55:54.000+01:00
diff --git a/config/configurations.gypi b/config/configurations.gypi
@@ -3,7 +3,8 @@
 	{
 		'variables':
 		{
-			'server_mode': 0,
+			'server_mode': 0,		# Target being built for a server deployment
+			'library_for_module': 0,	# Static library will be included in a dynamic lib
 		},
 		
 		'configurations':
diff --git a/config/linux.gypi b/config/linux.gypi
@@ -18,5 +18,20 @@
 		[
 			'../thirdparty/headers/linux/include',
 		],
+		
+		# Static libraries that are to be included into dynamic libraries
+		# need to be compiled with the correct compilation flags
+		'target_conditions':
+		[
+			[
+				'_type == "loadable_module" or (_type == "static_library" and library_for_module != 0)',
+				{
+					'cflags':
+					[
+						'-fPIC',
+					],
+				},
+			],
+		],
 	},
 }
diff --git a/libcore/libcore.gyp b/libcore/libcore.gyp
@@ -11,6 +11,11 @@
 			'target_name': 'libCore',
 			'type': 'static_library',
 
+			'variables':
+			{
+				'library_for_module': 1,
+			},
+
 			'include_dirs':
 			[
 				'include',
diff --git a/libexternal/libexternal.gyp b/libexternal/libexternal.gyp
@@ -10,6 +10,11 @@
 			'target_name': 'libExternal',
 			'type': 'static_library',
 
+			'variables':
+			{
+				'library_for_module': 1,
+			},
+
 			'include_dirs':
 			[
 				'include',
diff --git a/libexternalv1/libexternalv1.gyp b/libexternalv1/libexternalv1.gyp
@@ -10,6 +10,11 @@
 			'target_name': 'libExternalV1',
 			'type': 'static_library',
 			
+			'variables':
+			{
+				'library_for_module': 1,
+			},
+			
 			'include_dirs':
 			[
 				'include',
diff --git a/thirdparty b/thirdparty
@@ -1 +1 @@
-Subproject commit 8c05a045d21cc8f9205e605453b0e3a000a922b2
+Subproject commit 391dd22053d8b33612a2ce6edd211d2377b47d3e

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,8 @@`
`3`	`3`	`{`
`4`	`4`	`'variables':`
`5`	`5`	`{`
`6`		`- 'server_mode': 0,`
	`6`	`+ 'server_mode': 0, # Target being built for a server deployment`
	`7`	`+ 'library_for_module': 0, # Static library will be included in a dynamic lib`
`7`	`8`	`},`
`8`	`9`
`9`	`10`	`'configurations':`