Hide non-exported symbols in the Linux and Android engines

livecodefraser · livecodefraser · commit 09c7d9bf9be4 · 2015-06-23T12:07:21.000+01:00
diff --git a/config/android-settings.gypi b/config/android-settings.gypi
@@ -4,6 +4,7 @@
 		'-Wall',
 		'-Wextra',
 		'-fstrict-aliasing',
+		'-fvisibility=hidden',
 	],
 	
 	'cflags_c':
diff --git a/config/linux-settings.gypi b/config/linux-settings.gypi
@@ -25,13 +25,6 @@
 		'../thirdparty/libfreetype/include',	# Required by the Pango headers
 	],
 	
-	# Disable exceptions and RTTI, except where needed
-	'cflags_cc':
-	[
-		'-fno-exceptions',
-		'-fno-rtti',
-	],
-	
 	# Static libraries that are to be included into dynamic libraries
 	# need to be compiled with the correct compilation flags
 	'target_conditions':
@@ -74,6 +67,7 @@
 		'-Wall',
 		'-Wextra',
 		'-fstrict-aliasing',
+		'-fvisibility=hidden',
 	],
 	
 	'cflags_c':
diff --git a/engine/engine.gyp b/engine/engine.gyp
@@ -10,6 +10,20 @@
 		'kernel-server.gypi',
 	],
 	
+	'target_defaults':
+	{
+		'conditions':
+		[
+			[
+				'OS == "linux" or OS == "android"',
+				{
+					# Ensure that the symbols LCB binds to are exported from the engine
+					'ldflags': [ '-rdynamic' ],
+				},
+			],
+		],
+	},
+	
 	'targets':
 	[
 		{
diff --git a/toolchain/lc-compile/lc-run.gyp b/toolchain/lc-compile/lc-run.gyp
@@ -57,6 +57,13 @@
 						],
 					},
 				],
+				[
+				'OS == "linux" or OS == "android"',
+				{
+					# Ensure that the symbols LCB binds to are exported
+					'ldflags': [ '-rdynamic' ],
+				},
+			],
 			],
 			
 			'actions':
diff --git a/tools/extract-debug-symbols.sh b/tools/extract-debug-symbols.sh
@@ -19,13 +19,9 @@ for input in $@ ; do
 	# Extract a copy of the debugging information
 	$OBJCOPY --only-keep-debug "$input" "$output" 
 	
-	# If this file is a dynamic library, don't do a full strip or we'll
-	# destroy it (no symbols => can't link to it)
-	if [[ "$($OBJDUMP -f $input)" =~ "DYNAMIC" ]] ; then
-		$STRIP -x --preserve-dates --strip-debug "$input"
-	else
-		$STRIP -x --preserve-dates --strip-debug --strip-unneeded "$input"
-	fi
+	# Because we export symbols from the engine, only debug symbols
+	# should be stripped.
+	$STRIP -x --preserve-dates --strip-debug "$input"
 	
 	# Add a hint for the debugger so it can find the debug info
 	$OBJCOPY --preserve-dates --remove-section=.gnu_debuglink "$input"
