Merge pull request #135 from mapbox/tmpsantos-use_bfd_for_aarch64

Use bfd instead of gold linker on aarch64
mapbox · Mar 16, 2016 · 08e5627 · 08e5627
2 parents 920ccc7 + 7c36ccc
commit 08e5627
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/mason.sh b/mason.sh
@@ -127,7 +127,9 @@ elif [ ${MASON_PLATFORM} = 'android' ]; then
         export MASON_HOST_ARG="--host=${MASON_ANDROID_TOOLCHAIN}"
 
         export CFLAGS="-target aarch64-none-linux-android -D_LITTLE_ENDIAN ${CFLAGS}"
-        export LDFLAGS="-target aarch64-none-linux-android -fuse-ld=gold ${LDFLAGS}"
+
+        # Using bfd for aarch64: https://code.google.com/p/android/issues/detail?id=204151
+        export LDFLAGS="-target aarch64-none-linux-android -fuse-ld=bfd ${LDFLAGS}"
 
         export JNIDIR="arm64-v8a"
         MASON_ANDROID_ARCH="arm64"