Ensure that ar uses the LLVMgold plugin when building for Android

livecodefraser · livecodefraser · commit af1998d7319f · 2016-01-05T13:14:11.000Z
Otherwise it sometimes generates static libraries that the linker
cannot process.
diff --git a/config/android-settings.gypi b/config/android-settings.gypi
@@ -51,6 +51,11 @@
 				[
 					'-fuse-ld=gold',
 				],
+
+				'arflags':
+				[
+					'--plugin', '<!(echo $(dirname <(ar))/../lib/LLVMgold.so)',
+				],
 			},
 			{
 				'ldflags':
diff --git a/config/android.gypi b/config/android.gypi
@@ -27,6 +27,7 @@
 		'objcopy': '<!(echo ${OBJCOPY:-objcopy})',
 		'objdump': '<!(echo ${OBJDUMP:-objdump})',
 		'strip':   '<!(echo ${STRIP:-strip})',
+		'ar': '<!(echo ${AR:-ar})',
 	},
 	
 	'target_defaults':

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,11 @@`
`51`	`51`	`[`
`52`	`52`	`'-fuse-ld=gold',`
`53`	`53`	`],`
	`54`	`+`
	`55`	`+ 'arflags':`
	`56`	`+ [`
	`57`	`+ '--plugin', '<!(echo $(dirname <(ar))/../lib/LLVMgold.so)',`
	`58`	`+ ],`
`54`	`59`	`},`
`55`	`60`	`{`
`56`	`61`	`'ldflags':`