diff --git a/Dockerfile.build.macosx b/Dockerfile.build.macosx index 0b840bf..64977c8 100644 --- a/Dockerfile.build.macosx +++ b/Dockerfile.build.macosx @@ -16,7 +16,8 @@ RUN apt-get install -y cmake doxygen graphviz # Install Linting Tools -RUN apt-get install -y clang-14 clang-tidy-14 clang-format-14 clang-tools-14 lld-14 llvm-14-dev llvm-14-linker-tools +# RUN apt-get install -y clang-14 clang-tidy-14 clang-format-14 clang-tools-14 lld-14 llvm-14-dev llvm-14-linker-tools +RUN apt-get install -y clang clang-tidy clang-format clang-tools # Install Build Tools ADD osxcross.tar.bz2 ./ @@ -40,12 +41,12 @@ ENV PATH="/osxcross/bin:${PATH}" # Create links for clang for version 10 -RUN update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-14 20 -RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-14 20 -RUN update-alternatives --install /usr/bin/lld lld /usr/bin/lld-14 20 -RUN update-alternatives --set clang++ /usr/bin/clang++-14 -RUN update-alternatives --set clang /usr/bin/clang-14 -RUN update-alternatives --set lld /usr/bin/lld-14 +# RUN update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-14 20 +# RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-14 20 +# RUN update-alternatives --install /usr/bin/lld lld /usr/bin/lld-14 20 +# RUN update-alternatives --set clang++ /usr/bin/clang++-14 +# RUN update-alternatives --set clang /usr/bin/clang-14 +# RUN update-alternatives --set lld /usr/bin/lld-14 # RUN ln -s /usr/lib/llvm-14/lib/libLTO.so.14 /usr/lib/llvm-14/lib/libLTO.dylib ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/lib/llvm-14/lib"