admin/Jake-Shadle-xwin
1
0
Fork 0
mirror of https://github.com/Jake-Shadle/xwin synced 2026-06-08 11:22:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix docker build (#125)

Browse Source
This commit is contained in:
greaka
2024-06-14 11:03:31 +02:00
committed by GitHub
parent 078cd9e8f6
commit 8cdff355df
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xwin.dockerfile
+2 -2
View File
@@ -10,7 +10,7 @@ RUN set -eux; \
curl --fail https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor > $KEYRINGS/llvm.gpg; \
# wine
curl --fail https://dl.winehq.org/wine-builds/winehq.key | gpg --dearmor > $KEYRINGS/winehq.gpg; \
echo "deb [signed-by=$KEYRINGS/llvm.gpg] http://apt.llvm.org/bullseye/ llvm-toolchain-bookworm-18 main" > /etc/apt/sources.list.d/llvm.list; \
echo "deb [signed-by=$KEYRINGS/llvm.gpg] http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-18 main" > /etc/apt/sources.list.d/llvm.list; \
echo "deb [signed-by=$KEYRINGS/winehq.gpg] https://dl.winehq.org/wine-builds/debian/ bookworm main" > /etc/apt/sources.list.d/winehq.list;
RUN set -eux; \
@@ -26,7 +26,7 @@ RUN set -eux; \
# Unpack xwin
tar; \
# ensure that clang/clang++ are callable directly
ln -s clang-18 /usr/bin/clang && ln -s clang /usr/bin/clang++ && ln -s lld-13 /usr/bin/ld.lld; \
ln -s clang-18 /usr/bin/clang && ln -s clang /usr/bin/clang++ && ln -s lld-18 /usr/bin/ld.lld; \
# We also need to setup symlinks ourselves for the MSVC shims because they aren't in the debian packages
ln -s clang-18 /usr/bin/clang-cl && ln -s llvm-ar-18 /usr/bin/llvm-lib && ln -s lld-link-18 /usr/bin/lld-link && ln -s llvm-rc-18 /usr/bin/llvm-rc; \
# Verify the symlinks are correct