5858 target-cmake-flags : ${{ steps.vars.outputs.target-cmake-flags }}
5959 ccache : ${{ steps.vars.outputs.ccache }}
6060 build-flang : ${{ steps.vars.outputs.build-flang }}
61- enable-pgo : ${{ steps.vars.outputs.enable-pgo }}
6261 release-binary-basename : ${{ steps.vars.outputs.release-binary-basename }}
6362 release-binary-filename : ${{ steps.vars.outputs.release-binary-filename }}
6463 build-runs-on : ${{ steps.vars.outputs.build-runs-on }}
@@ -130,9 +129,6 @@ jobs:
130129 echo ccache=sccache >> $GITHUB_OUTPUT
131130 fi
132131
133- # Detect necessary CMake flags
134- echo "enable-pgo=false" >> $GITHUB_OUTPUT
135- target_cmake_flags="-DLLVM_RELEASE_ENABLE_PGO=OFF"
136132 # The macOS builds try to cross compile some libraries so we need to
137133 # add extra CMake args to disable them.
138134 # See https://github.com/llvm/llvm-project/issues/99767
@@ -238,13 +234,14 @@ jobs:
238234 ${{ needs.prepare.outputs.target-cmake-flags }} \
239235 -C clang/cmake/caches/Release.cmake \
240236 -DBOOTSTRAP_LLVM_PARALLEL_LINK_JOBS=1 \
241- -DBOOTSTRAP_CPACK_PACKAGE_FILE_NAME ="${{ needs.prepare.outputs.release-binary-basename }}"
237+ -DBOOTSTRAP_BOOTSTRAP_CPACK_PACKAGE_FILE_NAME ="${{ needs.prepare.outputs.release-binary-basename }}"
242238
243239 - name : Build
244240 shell : bash
245241 run : |
246242 ninja -v -C ${{ steps.setup-stage.outputs.build-prefix }}/build stage2-package
247- mv ${{ steps.setup-stage.outputs.build-prefix }}/build/tools/clang/stage2-bins/${{ needs.prepare.outputs.release-binary-filename }} .
243+ release_dir=`find ${{ steps.setup-stage.outputs.build-prefix }}/build -iname 'stage2-bins'`
244+ mv $release_dir/${{ needs.prepare.outputs.release-binary-filename }} .
248245
249246 - uses : actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
250247 with :
@@ -259,7 +256,7 @@ jobs:
259256 shell : bash
260257 run : |
261258 find ${{ steps.setup-stage.outputs.build-prefix }}/build -iname ${{ needs.prepare.outputs.release-binary-filename }} -delete
262- rm -Rf ${{ steps.setup-stage.outputs.build-prefix }}/build/tools/clang/stage2-bins/ _CPack_Packages
259+ find ${{ steps.setup-stage.outputs.build-prefix }}/build -iname _CPack_Packages -prune -exec rm -r {} +
263260
264261 - name : Save Stage
265262 uses : ./workflows-main/.github/workflows/release-binaries-save-stage
0 commit comments