Snap for 4585119 from 86592ef0123a5005d113b60cf8b1c2a406734996 to pi-release
Change-Id: I0b1924944708fca0191bbc94f5a69aa6ee27703d
diff --git a/build.py b/build.py
index 840ba56..04a9930 100755
--- a/build.py
+++ b/build.py
@@ -82,7 +82,6 @@
os.path.join(src_dir, 'configure'),
'--target={}'.format(ndk.abis.arch_to_triple(arch)),
'--host={}'.format(configure_host),
- '--enable-gold=default',
'--enable-initfini-array',
'--enable-plugins',
'--with-sysroot={}'.format(sysroot),
@@ -91,6 +90,11 @@
if arch == 'arm64':
configure_args.append('--enable-fix-cortex-a53-835769')
+ configure_args.append('--enable-gold')
+ else:
+ # Gold for aarch64 currently emits broken debug info.
+ # https://issuetracker.google.com/70838247
+ configure_args.append('--enable-gold=default')
if not is_windows:
# Multithreaded linking is implemented with pthreads, which we
@@ -139,6 +143,10 @@
env['CFLAGS'] = '-m32'
env['CXXFLAGS'] = '-m32'
env['LDFLAGS'] = '-m32'
+ else:
+ env['CFLAGS'] = '-m64'
+ env['CXXFLAGS'] = '-m64'
+ env['LDFLAGS'] = '-m64'
env_args = ['env'] + ['='.join([k, v]) for k, v in env.items()]
check_call(env_args + configure_args)