Update llvm install [skip ci]

simdsoft · Dec 20, 2024 · a3efd2b · a3efd2b
1 parent 9c2b980
commit a3efd2b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/1k/1kiss.ps1 b/1k/1kiss.ps1
@@ -2026,12 +2026,12 @@ if (!$setupOnly) {
                     if (($cmake_generator -eq 'Xcode') -and !$BUILD_ALL_OPTIONS.Contains('--verbose')) {
                         $forward_options += '--', '-quiet'
                     }
-                    $1k.println("cmake --build $BUILD_DIR $BUILD_ALL_OPTIONS")
 
                     if ($options.t) { $cmake_target = $options.t }
                     if ($cmake_target) {
                         $cmake_targets = $cmake_target.Split(',') | Sort-Object | Get-Unique
                         foreach ($target in $cmake_targets) {
+                            $1k.println("cmake --build $BUILD_DIR $BUILD_ALL_OPTIONS --target $target")
                             cmake --build $BUILD_DIR $BUILD_ALL_OPTIONS --target $target $forward_options | Out-Host
                             if (!$?) {
                                 Set-Location $stored_cwd
@@ -2040,6 +2040,7 @@ if (!$setupOnly) {
                         }
                     }
                     else {
+                        $1k.println("cmake --build $BUILD_DIR $BUILD_ALL_OPTIONS")
                         cmake --build $BUILD_DIR $BUILD_ALL_OPTIONS $forward_options | Out-Host
                         if (!$?) {
                             Set-Location $stored_cwd

diff --git a/build.ps1 b/build.ps1
@@ -226,6 +226,10 @@ Foreach ($lib_name in $libs) {
         }
     }
 
+    if ($build_conf.repo.EndsWith('.git') -and $rebuild) {
+        git -C $lib_src clean -dfx -e _1kiss
+    }
+
     $install_script = Join-Path $_1k_root "src/$lib_name/install1.ps1"
     $has_custom_install = (Test-Path $install_script)
 
@@ -272,6 +276,9 @@ Foreach ($lib_name in $libs) {
         . $custom_build_script $target_os $target_cpu $install_dir @forward_args
     }
     Pop-Location
+    if ($LASTEXITCODE) {
+        throw "Build $lib_name failed"
+    }
 
     # custom install step
     if ($has_custom_install) {

diff --git a/src/llvm/clean1.ps1 b/src/llvm/clean1.ps1
@@ -5,6 +5,5 @@ if ((Test-Path $install_dir -PathType Container)) {
     sremove (Join-Path $install_dir 'include')
     sremove (Join-Path $install_dir 'lib/*.lib')
     sremove (Join-Path $install_dir 'lib/*.a')
-    sremove (Join-Path $install_dir 'bin/*.exe')
     ls -R "$install_dir"
 }
diff --git a/src/llvm/install1.ps1 b/src/llvm/install1.ps1
@@ -1,7 +1,10 @@
 $install_dir = $args[0]
 # $libsrc_dir  = $args[1]
 
-$artifact_path = @('Release\bin\libclang.dll', 'lib\libclang.so', 'Release\lib\libclang.dylib')[$HOST_OS]
+$artifact_files = @(@('Release\bin\libclang.dll', 'Release\bin\clang-format.exe'), 'lib\libclang.so', 'Release\lib\libclang.dylib')[0]
 $install_dest = (Join-Path $install_dir (@('lib', 'bin')[$IsWin]))
 mkdirs $install_dest
-Copy-Item (Join-Path $BUILD_DIR "$artifact_path") $install_dest
+
+foreach($path in $artifact_files) {
+    Copy-Item (Join-Path $BUILD_DIR "$path") $install_dest
+}