22FROM registry.fedoraproject.org/fedora-minimal:latest AS build
33
44# Install Build dependencies and utilities.
5- RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install bzip2 clang cmake gawk git gzip file findutils patch python3 \
6- openssl openssl-devel xz-devel libxml2-develllvm-devel uuid-devel unzip tar xz zlib-devel && \
5+ RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install bzip2 clang-devel cmake gawk git gzip lld file findutils patch python3 \
6+ openssl openssl-devel xz-devel libxml2-devel uuid-devel unzip tar xz zlib-devel && \
77 microdnf clean all && \
88# Verify tool / language versions versions.
99 echo"Verifying clang install" && \
@@ -26,11 +26,12 @@ RUN mkdir build && cd build && \
2626
2727# Git clone osxcross repo
2828WORKDIR /usr/local/src
29- RUN git clone https://github.com/tpoechtrager/osxcross.git
29+ # RUN git clone https://github.com/tpoechtrager/osxcross.git && \
30+ # cd osxcross && git checkout 2.0-llvm-based
3031
31- # Use my fork of OSXCross until https://github.com/tpoechtrager/osxcross/pull/428 is pulled upstream.
32- # RUN git clone https://github.com/ProjectSynchro/osxcross.git && \
33- # cd osxcross && git checkoutosxcross-any-arch
32+ # Use my fork of OSXCross until https://github.com/tpoechtrager/osxcross/pull/459 is pulled upstream.
33+ RUN git clone https://github.com/ProjectSynchro/osxcross.git && \
34+ cd osxcross && git checkout2.0-llvm-based
3435
3536# Copy MacOS SDK tarball
3637COPY MacOSX14.sdk.tar.xz /usr/local/src/osxcross/tarballs
@@ -99,10 +100,8 @@ ENV OSXCROSS_MP_INC "1"
99100ENV APPIMAGE_EXTRACT_AND_RUN 1
100101
101102# Install build tools.
102- RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install clang cmake gettext genisoimage gawk git gzip llvm meson ninja-build python3-pip python3-pyyaml rustup unzip tar texinfo xz zlib zip && \
103+ RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install clangclang-devel clang++ cmake gettext genisoimage gawk git gzip llvm lld meson ninja-build python3-pip python3-pyyaml rustup unzip tar texinfo xz zlib zip && \
103104 microdnf clean all && \
104- # Need Meson >=1.7.0 for rust_std=2024, which needs Fedora 42
105- python3 -m pip install meson --upgrade && \
106105# Verify tool version.
107106 echo"Verifying meson install" && \
108107 command -v meson && \