File tree Expand file tree Collapse file tree 1 file changed +5
-2
lines changed Expand file tree Collapse file tree 1 file changed +5
-2
lines changed Original file line number Diff line number Diff line change @@ -178,7 +178,6 @@ jobs:
178178 target_cmake_flags="$target_cmake_flags -DLLVM_RELEASE_ENABLE_LTO=OFF"
179179 # libxml2 config
180180 target_cmake_flags="$target_cmake_flags -DBOOTSTRAP_CMAKE_FIND_PACKAGE_PREFER_CONFIG=ON -DBOOTSTRAP_BOOTSTRAP_CMAKE_FIND_PACKAGE_PREFER_CONFIG=ON"
181- target_cmake_flags="$target_cmake_flags -DBOOTSTRAP_LibXml2_DIR=/c/vcpkg/packages/libxml2_x64-windows-static/share/libxml2/ -DBOOTSTRAP_BOOTSTRAP_LibXml2_DIR=/c/vcpkg/packages/libxml2_x64-windows-static/share/libxml2/"
182181 fi
183182
184183 echo "target-cmake-flags=$target_cmake_flags" >> $GITHUB_OUTPUT
@@ -315,7 +314,6 @@ jobs:
315314 cmake -G Ninja -S llvm -B ${{ steps.setup-stage.outputs.build-prefix }}/build \
316315 ${{ needs.prepare.outputs.target-cmake-flags }} \
317316 -DLLVM_ENABLE_LIBXML2=FORCE_ON \
318- -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON \
319317 -C clang/cmake/caches/Release.cmake \
320318 -DBOOTSTRAP_BOOTSTRAP_CPACK_PACKAGE_FILE_NAME="${{ needs.prepare.outputs.release-binary-basename }}"
321319
@@ -331,6 +329,11 @@ jobs:
331329
332330 - name : Build
333331 shell : bash
332+ env :
333+ # Set this variable so that stage2-instrumented and stage2 configuration
334+ # steps can find libxml2. This only is used on Windows and setting
335+ # this variable should have no affect on other OSes.
336+ LIBXML2_ROOT : /c/vcpkg/packages/libxml2_x64-windows-static/
334337 run : |
335338 ninja -v -C ${{ steps.setup-stage.outputs.build-prefix }}/build stage2-package
336339 release_dir=`find ${{ steps.setup-stage.outputs.build-prefix }}/build -iname 'stage2-bins'`
You can’t perform that action at this time.
0 commit comments