From 46aa31c5003c17f4e170bf091d4cfa09128583ec Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Thu, 26 Mar 2020 06:55:57 +0000 Subject: Revert "Default to lld again." This reverts commit fed0a4058d786dcc73ee4d625388f9f416b719cc. Reason for revert: Broke Darwin again Change-Id: I0e432102934a3fb2ab659924b461a23a0eb64c44 --- ndk/checkbuild.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'ndk/checkbuild.py') diff --git a/ndk/checkbuild.py b/ndk/checkbuild.py index 6f3ed13be..6a1e82830 100755 --- a/ndk/checkbuild.py +++ b/ndk/checkbuild.py @@ -416,18 +416,14 @@ class Clang(ndk.builds.Module): # Remove LLD duplicates. We only need ld.lld. # http://b/74250510 + # + # Note that lld is experimental in the NDK. It is not the default for + # any architecture and has received only minimal testing in the NDK. bin_ext = '.exe' if self.host.is_windows else '' os.remove(os.path.join(install_path, 'bin/ld64.lld' + bin_ext)) os.remove(os.path.join(install_path, 'bin/lld' + bin_ext)) os.remove(os.path.join(install_path, 'bin/lld-link' + bin_ext)) - # But do create a plain ld binary, which will cause Clang to use it by - # default. - lld = Path(install_path) / f'bin/ld.lld{bin_ext}' - ld = Path(install_path) / f'bin/ld{bin_ext}' - shutil.copyfile(lld, ld) - shutil.copystat(lld, ld) - # Remove LLDB before it is ready for use. os.remove(os.path.join(install_path, 'bin/lldb' + bin_ext)) -- cgit v1.2.3