Force the use of Gold when going LTO Linux builds

livecodefraser · livecodefraser · commit 924ee632364e · 2015-11-27T13:58:52.000Z
diff --git a/config.sh b/config.sh
@@ -324,7 +324,7 @@ if test "${OS}" = "android" ; then
     ANDROID_AR=${AR:-${ANDROID_TOOLCHAIN}ar}
     ANDROID_CC=${CC:-${ANDROID_TOOLCHAIN}clang -target arm-linux-androideabi -march=armv6 -integrated-as}
     ANDROID_CXX=${CXX:-${ANDROID_TOOLCHAIN}clang++ -target arm-linux-androideabi -march=armv6 -integrated-as}
-    ANDROID_LINK=${LINK:-${ANDROID_TOOLCHAIN}clang++ -target arm-linux-androideabi -march=armv6 -integrated-as -fuse-ld=bfd}
+    ANDROID_LINK=${LINK:-${ANDROID_TOOLCHAIN}clang++ -target arm-linux-androideabi -march=armv6 -integrated-as}
     ANDROID_OBJCOPY=${OBJCOPY:-${ANDROID_TOOLCHAIN}objcopy}
     ANDROID_OBJDUMP=${OBJDUMP:-${ANDROID_TOOLCHAIN}objdump}
     ANDROID_STRIP=${STRIP:-${ANDROID_TOOLCHAIN}strip}
diff --git a/config/linux-settings.gypi b/config/linux-settings.gypi
@@ -26,6 +26,20 @@
 		'../thirdparty/libcairo/src',			# Required by the GDK headers
 		'../thirdparty/libfreetype/include',	# Required by the Pango headers
 	],
+
+	'conditions':
+	[
+		[
+			# For consistency, we should use the same linker in both Debug and Release builds
+			'supports_lto != 0',
+			{
+				'ldflags':
+				[
+					'-fuse-ld=gold',
+				],
+			},
+		],
+	],
 	
 	# Static libraries that are to be included into dynamic libraries
 	# need to be compiled with the correct compilation flags
@@ -142,13 +156,15 @@
 						'cflags':
 						[
 							'-flto',
+							'-ffunction-sections',
 						],
 
 						'ldflags':
 						[
 							'-flto',
-							'-O3',
-							'-g3',
+							'-Wl,--icf=all',
+							'>@(_cflags)',
+							'>@(_cflags_cc)',
 						],
 					},
 				],
