working for linux, not macOS

MaterializeInc · Jan 11, 2025 · 286053b · 286053b
1 parent b051875
commit 286053b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/macos-clang.yml b/.github/workflows/macos-clang.yml
@@ -163,12 +163,13 @@ jobs:
               build_dir="build"
               # Strip the 'build:' prefix if it exists.
               val=${val#build:}
-              eval cp -rP llvm-project/$build_dir/$dir/$val package_libclang/$dir/
+              # Follow symlinks, copying what they point to.
+              eval cp -r llvm-project/$build_dir/$dir/$val package_libclang/$dir/
             done
           done
 
           cd package_libclang
-          tar -cf - * | zstd --ultra -22 -o "../darwin_libclang_$CLANG_ARCH.tar.zst"
+          tar -cf - * | zstd --ultra -22 -o ../darwin_"$CLANG_ARCH"_libclang.tar.zst
 
       - name: Upload Toolchain Artifact
         uses: actions/upload-artifact@v4
@@ -181,4 +182,5 @@ jobs:
         with:
           file: "*.tar.zst"
           file_glob: true
+          tag: ${{ env.RELEASE_TAG }}
           overwrite: ${{ inputs.overwrite }}
diff --git a/clang/clang_package.sh b/clang/clang_package.sh
@@ -106,7 +106,7 @@ done
 # Compress the whole directory.
 
 cd package_libclang
-tar -cf - * | zstd --ultra -22 -o "../linux_libclang_$clang_arch.tar.zst"
+tar -cf - * | zstd --ultra -22 -o ../linux_"$clang_arch"_libclang.tar.zst
 
 cd ..
-mv "linux_libclang_$clang_arch.tar.zst" "artifacts/linux_libclang_$clang_arch.tar.zst"
+mv linux_"$clang_arch"_libclang.tar.zst artifacts/linux_"$clang_arch"_libclang.tar.zst
diff --git a/clang/lib_libclang.txt b/clang/lib_libclang.txt
@@ -1,4 +1,6 @@
 libclang.$shared_extension
+libclang.$shared_extension.$clang_version
+libclang.$shared_extension.$clang_major_minor
 build:libc++.$shared_extension.1.0
 build:libc++.$shared_extension.1
 build:libc++.$shared_extension