diff options
author | Haibo Huang <hhb@google.com> | 2019-08-21 10:54:34 -0700 |
---|---|---|
committer | Haibo Huang <hhb@google.com> | 2019-08-21 10:54:34 -0700 |
commit | 73f964129b86d4513706159e0a958f40e7e217fd (patch) | |
tree | 03c264107e58214af55ed3f8364476a797bdf025 | |
parent | 57ecabe50a3de5386aa8899d488b57da4b294d71 (diff) | |
download | ndk-73f964129b86d4513706159e0a958f40e7e217fd.tar.gz |
Do not rename LLVMgold.dll
In the new toolchain, LLVMgold.dll is already in lib64/
Test: build.py
Change-Id: I272d4538cc6996ae2696038e536ffa6af5621796
-rwxr-xr-x | ndk/checkbuild.py | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/ndk/checkbuild.py b/ndk/checkbuild.py index 31a4fc46a..291c8a41b 100755 --- a/ndk/checkbuild.py +++ b/ndk/checkbuild.py @@ -320,13 +320,6 @@ class Clang(ndk.builds.Module): os.remove(os.path.join(install_path, 'bin/lldb' + bin_ext)) if self.host.is_windows: - # The toolchain prebuilts have LLVMgold.dll in the bin directory - # rather than the lib directory that will actually be searched. - bin_dir = os.path.join(install_path, 'bin') - lib_dir = os.path.join(install_path, 'lib64') - os.rename(os.path.join(bin_dir, 'LLVMgold.dll'), - os.path.join(lib_dir, 'LLVMgold.dll')) - # Windows doesn't support rpath, so we need to copy # libwinpthread-1.dll too. shutil.copy2(os.path.join(bin_dir, 'libwinpthread-1.dll'), |