Skip to content

Commit faacbba

Browse files
authored
Install missing packages in azl 4.0 crossdeps (#1733)
1 parent 668e642 commit faacbba

2 files changed

Lines changed: 9 additions & 3 deletions

File tree

src/azurelinux/4.0/net11.0/crossdeps-llvm/amd64/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,5 @@ FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-crossdep
22

33
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-4.0-net11.0-crossdeps-amd64
44

5-
# dummy change to trigger cross/ images build after llvm update
6-
75
# Install LLVM that we built from source
86
COPY --from=builder /opt/llvm /usr/local

src/azurelinux/4.0/net11.0/crossdeps/amd64/Dockerfile

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ RUN dnf update -y && \
1010
# Provides 'su', required by Azure DevOps
1111
ca-certificates \
1212
git \
13-
pigz \
1413
shadow-utils \
1514
util-linux \
1615
wget2-wget \
@@ -19,11 +18,14 @@ RUN dnf update -y && \
1918
cpio \
2019
file \
2120
gcc \
21+
gcc-c++ \
2222
make \
2323
cmake \
2424
diffutils \
25+
gzip \
2526
icu \
2627
ninja-build \
28+
pigz \
2729
tar \
2830
# Crosscomponents build dependencies
2931
glibc-devel \
@@ -38,6 +40,12 @@ RUN dnf update -y && \
3840
azure-cli \
3941
&& dnf clean all
4042

43+
# GNU toolchain is installed in 'x86_64-azurelinux-linux' directory which is not recognized by
44+
# clang (https://github.com/llvm/llvm-project/blob/main/clang/lib/Driver/ToolChains/Gnu.cpp),
45+
# so we create a symlink with -pc- triplet.
46+
RUN ln -s /usr/lib/gcc/x86_64-azurelinux-linux /usr/lib/gcc/x86_64-pc-linux-gnu && \
47+
ln -s /usr/include/c++/15/x86_64-azurelinux-linux /usr/include/c++/15/x86_64-pc-linux-gnu;
48+
4149
COPY --from=powershell /usr/share/dotnet/LICENSE.txt /usr/share/dotnet/ThirdPartyNotices.txt /usr/share/dotnet/dotnet /usr/share/dotnet/
4250
COPY --from=powershell /usr/share/dotnet/host /usr/share/dotnet/host
4351
COPY --from=powershell /usr/share/dotnet/shared /usr/share/dotnet/shared

0 commit comments

Comments
 (0)