Skip to content

Commit 261f4e9

Browse files
committed
use provided toolchain files
1 parent 79bfd47 commit 261f4e9

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

Dockerfile

+13-12
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,21 @@ LABEL org.opencontainers.image.source=https://github.com/halide/docker-images
55

66
WORKDIR /ws
77

8-
## Install Ninja
9-
ARG NINJA_VERSION=v1.12.1
10-
RUN git clone --depth 1 --branch ${NINJA_VERSION} https://github.com/ninja-build/ninja.git && \
11-
cmake -S ninja -B build -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF && \
12-
cmake --build build --target install -j "$(nproc)" && \
13-
rm -rf ninja build
8+
## Install Ninja & CMake
9+
RUN apt-get remove -y cmake && \
10+
apt-get -y autoremove && \
11+
python -m pip install ninja==1.11.1.1 cmake==3.28.4
12+
13+
## Set the prefix path to an arch-specific folder
14+
ENV CMAKE_PREFIX_PATH=/usr/local/$CARGO_BUILD_TARGET
1415

1516
## Install flatbuffers
1617
ARG FB_VERSION=v23.5.26
1718
RUN git clone --depth 1 --branch ${FB_VERSION} https://github.com/google/flatbuffers.git && \
1819
cmake -G Ninja -S flatbuffers -B build \
1920
-DCMAKE_BUILD_TYPE=Release \
20-
-DCMAKE_C_COMPILER=$TARGET_CC \
21-
-DCMAKE_CXX_COMPILER=$TARGET_CXX \
21+
-DCMAKE_INSTALL_PREFIX=/usr/local/$CARGO_BUILD_TARGET \
22+
-DCMAKE_TOOLCHAIN_FILE=$TARGET_CMAKE_TOOLCHAIN_FILE_PATH \
2223
-DFLATBUFFERS_BUILD_TESTS=OFF \
2324
&& \
2425
cmake --build build --target install && \
@@ -30,8 +31,8 @@ RUN git clone --depth 1 --branch ${WABT_VERSION} https://github.com/WebAssembly/
3031
git -C wabt submodule update --init third_party/picosha2 && \
3132
cmake -G Ninja -S wabt -B build \
3233
-DCMAKE_BUILD_TYPE=Release \
33-
-DCMAKE_C_COMPILER=$TARGET_CC \
34-
-DCMAKE_CXX_COMPILER=$TARGET_CXX \
34+
-DCMAKE_INSTALL_PREFIX=/usr/local/$CARGO_BUILD_TARGET \
35+
-DCMAKE_TOOLCHAIN_FILE=$TARGET_CMAKE_TOOLCHAIN_FILE_PATH \
3536
-DWITH_EXCEPTIONS=ON \
3637
-DBUILD_TESTS=OFF \
3738
-DBUILD_TOOLS=OFF \
@@ -49,8 +50,8 @@ RUN git clone --depth 1 --branch ${LLVM_TAG} https://github.com/llvm/llvm-projec
4950
"-DLLVM_ENABLE_RUNTIMES=compiler-rt" \
5051
"-DLLVM_TARGETS_TO_BUILD=WebAssembly;X86;AArch64;ARM;Hexagon;NVPTX;PowerPC;RISCV" \
5152
-DCMAKE_BUILD_TYPE=Release \
52-
-DCMAKE_C_COMPILER=$TARGET_CC \
53-
-DCMAKE_CXX_COMPILER=$TARGET_CXX \
53+
-DCMAKE_INSTALL_PREFIX=/usr/local/$CARGO_BUILD_TARGET \
54+
-DCMAKE_TOOLCHAIN_FILE=$TARGET_CMAKE_TOOLCHAIN_FILE_PATH \
5455
-DLLVM_BUILD_32_BITS=OFF \
5556
-DLLVM_ENABLE_ASSERTIONS=ON \
5657
-DLLVM_ENABLE_BINDINGS=OFF \

0 commit comments

Comments
 (0)