File tree Expand file tree Collapse file tree 2 files changed +4
-3
lines changed Expand file tree Collapse file tree 2 files changed +4
-3
lines changed Original file line number Diff line number Diff line change @@ -161,8 +161,8 @@ jobs:
161161 # at Microsoft.Tools.WindowsInstallerXml.CabinetBuilder.CreateCabinet(CabinetWorkItem cabinetWorkItem)
162162 #libxml2_prefix="/c/vcpkg/packages/libxml2_x64-windows-static/"
163163 target_cmake_flags="$target_cmake_flags -DLLVM_RELEASE_ENABLE_LTO=OFF"
164- # target_cmake_flags="$target_cmake_flags -DLLVM_RELEASE_LIBXML2_PREFIX=/s/libxml-install/"
165- target_cmake_flags="$target_cmake_flags -DLLVM_RELEASE_LIBXML2_PREFIX=/c/vcpkg/packages/libxml2_x64-windows-static/"
164+ target_cmake_flags="$target_cmake_flags -DLLVM_RELEASE_LIBXML2_PREFIX=/s/libxml-install/"
165+ # target_cmake_flags="$target_cmake_flags -DLLVM_RELEASE_LIBXML2_PREFIX=/c/vcpkg/packages/libxml2_x64-windows-static/"
166166 fi
167167
168168 echo "target-cmake-flags=$target_cmake_flags" >> $GITHUB_OUTPUT
@@ -262,6 +262,7 @@ jobs:
262262 ninja -v -C libxml-build install
263263
264264 - name : Install libxml2
265+ if : false
265266 shell : bash
266267 env :
267268 VCPKG_BUILD_TYPE : release
Original file line number Diff line number Diff line change @@ -41,7 +41,7 @@ if(${CMAKE_HOST_SYSTEM_NAME} MATCHES "Windows")
4141 if (LLVM_RELEASE_LIBXML2_PREFIX)
4242 # Enable libxml2 with static linking. This is necessary for llvm-mt.
4343 set_instrument_and_final_stage_var(LLVM_ENABLE_LIBXML2 "FORCE_ON" STRING )
44- set_instrument_and_final_stage_var(LIBXML2_LIBRARIES "${LLVM_RELEASE_LIBXML2_PREFIX} /lib/libxml2 .lib" STRING )
44+ set_instrument_and_final_stage_var(LIBXML2_LIBRARIES "${LLVM_RELEASE_LIBXML2_PREFIX} /lib/libxml2s .lib" STRING )
4545 set_instrument_and_final_stage_var(LIBXML2_INCLUDE_DIR "${LLVM_RELEASE_LIBXML2_PREFIX} /include/libxml2" STRING )
4646 set_instrument_and_final_stage_var(LIBXML2_DEFINITIONS "-DLIBXML_STATIC" STRING )
4747 endif ()
You can’t perform that action at this time.
0 commit comments