Merge branch 'issue-8-mv-llvm-cmake-patches' of github.com:ParaToolsI…

…nc/salt-dev

.dockerignore

@@ -4,3 +4,7 @@ Dockerfile
 /.github/
 *.md
 LICENSE
+/patches/README.md
+/patches/LICENSE
+/patches/.git/
+

.github/workflows/CI.yml

@@ -1,5 +1,7 @@
 name: ci
 # See https://docs.docker.com/build/ci/github-actions/examples
+env:
+  DOCKER_BUILDKIT: 1
 
 on:
   schedule:
@@ -38,6 +40,8 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v3
+        with:
+          submodules: recursive
       -
         name: Login to Docker Hub
         if: github.event_name != 'pull_request'

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "patches"]
+	path = patches
+	url = https://github.com/ParaToolsInc/salt-llvm-patches.git

Dockerfile

@@ -97,7 +97,6 @@ RUN --mount=type=cache,target=/ccache/ <<EOC
     -DCMAKE_MAKE_PROGRAM=/usr/local/bin/ninja \
     -DCMAKE_BUILD_TYPE=Release \
     -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra" \
-    -DLLVM_TARGETS_TO_BUILD=X86 \
     -S /llvm-project/llvm -B /llvm-project/llvm/build
 
   # Build libraries, headers, and binaries
@@ -175,3 +174,4 @@ RUN --mount=type=cache,target=/home/salt/ccache <<EOC
 EOC
 
 ENV PATH="${PATH}:/usr/local/x86_64/bin"
+RUN alias ls="ls --color=auto"

README.md

@@ -6,6 +6,10 @@ Container definitions for [SALT] development.
 
 This repository defines and deploys the containers used for [SALT] continuous integration (CI) and local development.
 
+LLVM/Clang patches needed by [SALT] for minimal LLVM/Clang builds are shared between this repository
+and [SALT] using a [git submodule].
+The patches are stored here: https://github.com/ParaToolsInc/salt-llvm-patches
+
 ## Building the development container for local use
 
 First, BuildKit, caching and intelligent layer creation and ordering have been employed
@@ -82,3 +86,4 @@ Very useful examples are available [here](https://docs.docker.com/build/ci/githu
 
 
 [SALT]: https://github.com/ParaToolsInc/salt
+[git submodule]: https://git-scm.com/book/en/v2/Git-Tools-Submodules