Merge pull request #6472 from everpcpc/fix/musl

fix(build-tool): add c module include path for musl build-tool image
databendlabs · Jul 5, 2022 · 08ab9a8 · 08ab9a8
2 parents 78c725c + 3528563
commit 08ab9a8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.github/workflows/dev-linux.yml b/.github/workflows/dev-linux.yml
@@ -7,6 +7,7 @@ on:
       - "website/**"
       - "**.md"
       - "scripts/setup/**"
+      - "docker/**"
       - ".devcontainer/**"
 
 concurrency:

diff --git a/docker/build-tool/musl/Dockerfile b/docker/build-tool/musl/Dockerfile
@@ -15,6 +15,6 @@ RUN curl -sSfLo /tmp/musl-cross-make.tar.gz https://github.com/richfelker/musl-c
     rm -rf /tmp/musl-cross-make-* && \
     rm -f /tmp/musl-cross-make.tar.gz
 
+ENV C_INCLUDE_PATH /usr/local/${ARCH}-linux-musl/include/
 RUN rustup target add ${ARCH}-unknown-linux-musl
-RUN ln -s ${ARCH}-linux-musl-gcc /usr/local/bin/musl-gcc
 RUN printf "[target.${ARCH}-unknown-linux-musl]\nlinker = \"${ARCH}-linux-musl-gcc\"\n" > ${CARGO_HOME}/config