Delete julia-patches/ffba662dd275d1bdd5a5935f4d3cc372b5235d07 (#37)

* Delete julia-patches/ffba662dd275d1bdd5a5935f4d3cc372b5235d07

* Update 52c338daece1ea5556865373c777bdad79a05fd8

* Update build-and-test.yml

Author: Zentrik

.github/workflows/build-and-test.yml

@@ -36,7 +36,7 @@ jobs:
           if [ -z "$LLVM_VERSION" ]; then
             LLVM_VERSION=$(git ls-remote https://github.com/llvm/llvm-project.git | grep 'refs/heads/main$' | awk '{print $1}')
           fi
-          LLVM_VERSION_MAJOR=$(curl -s https://raw.githubusercontent.com/llvm/llvm-project/$LLVM_VERSION/cmake/Modules/LLVMVersion.cmake | grep 'set(LLVM_VERSION_MAJOR' | awk '{print $2}' | tr -d ')')
+          LLVM_VERSION_MAJOR=$(curl -s https://raw.githubusercontent.com/llvm/llvm-project/$LLVM_VERSION/cmake/Modules/LLVMVersion.cmake | grep -oP 'set\(LLVM_VERSION_MAJOR \K[0-9]+')
           echo "LLVM_VERSION=$LLVM_VERSION" >> "$GITHUB_OUTPUT"
           echo "LLVM_VERSION_MAJOR=$LLVM_VERSION_MAJOR" >> "$GITHUB_OUTPUT"
   build:

julia-patches/52c338daece1ea5556865373c777bdad79a05fd8

@@ -1,13 +1,13 @@
 diff --git a/deps/csl.mk b/deps/csl.mk
-index fefe71a5e8..cf77cd30d2 100644
+index fef950aa41..240089372f 100644
 --- a/deps/csl.mk
 +++ b/deps/csl.mk
-@@ -107,6 +107,7 @@ $(eval $(call bb-install,csl,CSL,true))
- ifeq ($(OS),WINNT)
+@@ -120,6 +120,7 @@ ifeq ($(OS),WINNT)
+ GCC_VERSION = 14
  install-csl:
  	mkdir -p $(build_private_libdir)/
 +	cp -a $(build_shlibdir)/$(call versioned_libname,libstdc++,6) $(build_shlibdir)/libstdc++.$(SHLIB_EXT)
- 	cp -a $(build_libdir)/gcc/$(BB_TRIPLET)/13/libgcc_s.a $(build_private_libdir)/
- 	cp -a $(build_libdir)/gcc/$(BB_TRIPLET)/13/libgcc.a $(build_private_libdir)/
- 	cp -a $(build_libdir)/gcc/$(BB_TRIPLET)/13/libmsvcrt.a $(build_private_libdir)/
+ 	cp -a $(build_libdir)/gcc/$(BB_TRIPLET)/$(GCC_VERSION)/libgcc_s.a $(build_private_libdir)/
+ 	cp -a $(build_libdir)/gcc/$(BB_TRIPLET)/$(GCC_VERSION)/libgcc.a $(build_private_libdir)/
+ 	cp -a $(build_libdir)/gcc/$(BB_TRIPLET)/$(GCC_VERSION)/libmsvcrt.a $(build_private_libdir)/