Skip to content

Commit 43a6446

Browse files
authored
Use branded triplet in llvm build on AZL 4.0 (#1734)
1 parent faacbba commit 43a6446

2 files changed

Lines changed: 1 addition & 6 deletions

File tree

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ RUN \
119119
-DCMAKE_BUILD_TYPE=Release \
120120
-DCMAKE_C_COMPILER=clang \
121121
-DCMAKE_CXX_COMPILER=clang++ \
122+
-DLLVM_DEFAULT_TARGET_TRIPLE="$(uname -m)-azurelinux-linux-gnu" \
122123
-DLLVM_TARGETS_TO_BUILD="X86;AArch64;ARM;PowerPC;RISCV;SystemZ;LoongArch" \
123124
-Wno-dev \
124125
-DLLVM_ENABLE_PROJECTS="clang;lld;clang-tools-extra" && \

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,6 @@ RUN dnf update -y && \
4040
azure-cli \
4141
&& dnf clean all
4242

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-
4943
COPY --from=powershell /usr/share/dotnet/LICENSE.txt /usr/share/dotnet/ThirdPartyNotices.txt /usr/share/dotnet/dotnet /usr/share/dotnet/
5044
COPY --from=powershell /usr/share/dotnet/host /usr/share/dotnet/host
5145
COPY --from=powershell /usr/share/dotnet/shared /usr/share/dotnet/shared

0 commit comments

Comments
 (0)