Skip to content

Commit 15a392a

Browse files
committed
[LDC] CI: Disable libxml2 dependency
See ldc-developers/ldc#4921.
1 parent da08766 commit 15a392a

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.github/actions/1-setup/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ runs:
1515
export DEBIAN_FRONTEND=noninteractive
1616
sudo apt-get -q update
1717
sudo -E apt-get -yq install \
18-
git-core curl xz-utils g++ python3 pkgconf binutils-dev libxml2-dev libzstd-dev zlib1g-dev p7zip-full unzip \
18+
git-core curl xz-utils g++ python3 pkgconf binutils-dev libzstd-dev zlib1g-dev p7zip-full unzip \
1919
lsb-release wget software-properties-common gnupg # prerequisites of apt.llvm.org install script
2020
2121
- name: 'Linux: Install clang 20 from apt.llvm.org'

.github/workflows/ldc-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ env:
1515
# for compiler-rt tests.
1616
BASE_CMAKE_FLAGS: >-
1717
-DLLVM_ENABLE_LIBEDIT=OFF
18+
-DLLVM_ENABLE_LIBXML2=OFF
1819
-DLLVM_USE_STATIC_ZSTD=TRUE
1920
-DCOMPILER_RT_INCLUDE_TESTS=OFF
2021
-DLLVM_INCLUDE_TESTS=OFF
@@ -104,12 +105,11 @@ jobs:
104105
experimental_targets_to_build: Xtensa
105106
with_asserts: ${{ matrix.with_asserts }}
106107
# - link C++ standard library statically for improved portability on Windows and Linux
107-
# - on Windows, avoid wrongly detected libxml2 on GHA runner
108108
# - on Linux, need LLVM_BINUTILS_INCDIR to generate LTO linker plugin
109109
# - on macOS, disable libzstd dependency
110110
extra_cmake_flags: >-
111111
${{ env.BASE_CMAKE_FLAGS }}
112-
${{ runner.os == 'Windows' && '-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded -DLLVM_ENABLE_LIBXML2=OFF' || '' }}
112+
${{ runner.os == 'Windows' && '-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded' || '' }}
113113
${{ runner.os == 'Linux' && '-DLLVM_BINUTILS_INCDIR=/usr/include -DLLVM_STATIC_LINK_CXX_STDLIB=ON' || '' }}
114114
${{ runner.os == 'macOS' && '-DLLVM_ENABLE_ZSTD=OFF' || '' }}
115115
- name: Create package & upload artifact

0 commit comments

Comments
 (0)