@@ -188,6 +188,9 @@ jobs:
188188 git remote add fork https://github.com/Zentrik/julia
189189 git fetch --all # https://jvns.ca/blog/2023/11/10/how-cherry-pick-and-revert-work/
190190
191+ git checkout -b llvm-19-actual fork/llvm-19-actual
192+
193+
191194 for patch in ${{ needs.build_llvm_assert.outputs.JULIA_PATCHES_TO_APPLY }}; do
192195 git apply $GITHUB_WORKSPACE/julia-patches/$patch -v --3way
193196 done
@@ -196,12 +199,6 @@ jobs:
196199 JULIA_LLVM_VERSION=$(grep 'version' stdlib/libLLVM_jll/Project.toml | sed 's/version = "\(.*\)"/\1/')
197200 mv ../LLVM_full_assert.v${LLVM_VERSION_MAJOR}.0.0.${{ inputs.target }}.tar.gz deps/srccache/libLLVM.v$JULIA_LLVM_VERSION.${{ inputs.target }}.tar.gz
198201
199- if [[ "${{ inputs.target }}" == "x86_64-w64-mingw32-cxx11" ]]; then
200- JULIA_CPU_TARGET="generic;sandybridge,-xsaveopt,clone_all;haswell,-rdrnd,base(1)"
201- else
202- JULIA_CPU_TARGET="pentium4"
203- fi
204-
205202 make -j4 FORCE_ASSERTIONS=1 LLVM_ASSERTIONS=1 VERBOSE=1 LLVM_JLL_TAGS= LLVM_SHARED_LIB_VER_SUFFIX=${LLVM_VERSION_MAJOR}jl JULIA_CPU_TARGET=$JULIA_CPU_TARGET
206203 make FORCE_ASSERTIONS=1 LLVM_ASSERTIONS=1 VERBOSE=1 LLVM_JLL_TAGS= LLVM_SHARED_LIB_VER_SUFFIX=${LLVM_VERSION_MAJOR}jl JULIA_CPU_TARGET=$JULIA_CPU_TARGET binary-dist
207204 - name : Upload artifacts
@@ -235,6 +232,8 @@ jobs:
235232 git remote add fork https://github.com/Zentrik/julia
236233 git fetch --all # https://jvns.ca/blog/2023/11/10/how-cherry-pick-and-revert-work/
237234
235+ git checkout -b llvm-19-actual fork/llvm-19-actual
236+
238237 for patch in ${{ needs.build_llvm_assert.outputs.JULIA_PATCHES_TO_APPLY }}; do
239238 git apply $GITHUB_WORKSPACE/julia-patches/$patch -v --3way
240239 done
@@ -243,8 +242,8 @@ jobs:
243242 JULIA_LLVM_VERSION=$(grep 'version' stdlib/libLLVM_jll/Project.toml | sed 's/version = "\(.*\)"/\1/')
244243 mv ../LLVM_full_assert.v${LLVM_VERSION_MAJOR}.0.0.${{ inputs.target }}.tar.gz deps/srccache/libLLVM.v$JULIA_LLVM_VERSION.${{ inputs.target }}.tar.gz
245244
246- make -j4 FORCE_ASSERTIONS=1 LLVM_ASSERTIONS=1 VERBOSE=1 LLVM_JLL_TAGS= LLVM_SHARED_LIB_VER_SUFFIX=${LLVM_VERSION_MAJOR}jl JULIA_CPU_TARGET="generic;sandybridge,-xsaveopt,clone_all;haswell,-rdrnd,base(1)"
247- make FORCE_ASSERTIONS=1 LLVM_ASSERTIONS=1 VERBOSE=1 LLVM_JLL_TAGS= LLVM_SHARED_LIB_VER_SUFFIX=${LLVM_VERSION_MAJOR}jl JULIA_CPU_TARGET="generic;sandybridge,-xsaveopt,clone_all;haswell,-rdrnd,base(1)" binary-dist
245+ make -j4 FORCE_ASSERTIONS=1 LLVM_ASSERTIONS=1 VERBOSE=1 LLVM_JLL_TAGS= LLVM_SHARED_LIB_VER_SUFFIX=${LLVM_VERSION_MAJOR}jl
246+ make FORCE_ASSERTIONS=1 LLVM_ASSERTIONS=1 VERBOSE=1 LLVM_JLL_TAGS= LLVM_SHARED_LIB_VER_SUFFIX=${LLVM_VERSION_MAJOR}jl binary-dist
248247 - name : Upload artifacts
249248 uses : actions/upload-artifact@v4
250249 with :
0 commit comments