Package Windows libclang.dll

Bug: android/ndk#2046 Test: ./toolchain/llvm_android/build.py --no-build linux Change-Id: I0e4437050d949f9fd1f972bc2945fc5189062a83
bvlgah · Oct 29, 2024 · b4a8742 · b4a8742
1 parent 90750ac
commit b4a8742
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/do_build.py b/do_build.py
@@ -485,6 +485,7 @@ def package_toolchain(toolchain_builder: LLVMBuilder,
             'scan-view' + ext,
         }
         necessary_bin_files -= windows_exclude_bin_files
+        necessary_bin_files.add('libclang.dll')
 
     # scripts that should not be stripped
     script_bins = {

diff --git a/src/llvm_android/base_builders.py b/src/llvm_android/base_builders.py
@@ -741,10 +741,10 @@ def cmake_defines(self) -> Dict[str, str]:
         defines['LLVM_ENABLE_RUNTIMES'] = ';'.join(sorted(self.llvm_runtime_projects))
 
         defines['LLVM_TARGETS_TO_BUILD'] = ';'.join(sorted(self.llvm_targets))
-        if self._config.target_os.is_darwin or self._config.target_os.is_linux:
-            defines['LLVM_BUILD_LLVM_DYLIB'] = 'ON'
-        elif isinstance(self._config, configs.MSVCConfig):
+        if isinstance(self._config, configs.MSVCConfig):
             defines['LLVM_BUILD_LLVM_C_DYLIB'] = 'OFF'
+        else:
+            defines['LLVM_BUILD_LLVM_DYLIB'] = 'ON'
 
         if self.build_tags:
             tags_str = ''.join(tag + ', ' for tag in self.build_tags)