Skip to content

Commit 07e342d

Browse files
committed
Attempt to build with vcpkg
1 parent 66a76ec commit 07e342d

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

.github/workflows/release-binaries.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,8 @@ jobs:
168168
# at Microsoft.Tools.WindowsInstallerXml.CabinetBuilder.CreateCabinet(CabinetWorkItem cabinetWorkItem)
169169
#libxml2_prefix="/c/vcpkg/packages/libxml2_x64-windows-static/"
170170
target_cmake_flags="$target_cmake_flags -DLLVM_RELEASE_ENABLE_LTO=OFF"
171-
target_cmake_flags="$target_cmake_flags -DLLVM_RELEASE_LIBXML2_PREFIX=/s/libxml-install/"
171+
#target_cmake_flags="$target_cmake_flags -DLLVM_RELEASE_LIBXML2_PREFIX=/s/libxml-install/"
172+
target_cmake_flags="$target_cmake_flags -DLLVM_RELEASE_LIBXML2_PREFIX=/c/vcpkg/packages/libxml2_x64-windows-static/"
172173
fi
173174
174175
echo "target-cmake-flags=$target_cmake_flags" >> $GITHUB_OUTPUT

clang/cmake/caches/Release.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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/libxml2s.lib" STRING)
44+
set_instrument_and_final_stage_var(LIBXML2_LIBRARIES "${LLVM_RELEASE_LIBXML2_PREFIX}/lib/libxml2.lib" STRING)
4545
set_instrument_and_final_stage_var(LLVM_ENABLE_LIBXML2 "${LLVM_RELEASE_LIBXML2_PREFIX}/include/libxml2" STRING)
4646
set_instrument_and_final_stage_var(LIBXML2_DEFINITIONS "-DLIBXML_STATIC" STRING)
4747
endif()

0 commit comments

Comments
 (0)