From 251a765b242ce806aad2b82048ebddf75c273681 Mon Sep 17 00:00:00 2001 From: Eduardo Santos Date: Thu, 21 Dec 2023 14:05:10 +0000 Subject: [PATCH] Add cross compile for windows --- Dockerfile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 86bf1af..a27e1e1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -99,12 +99,10 @@ RUN cp config.example.toml config.toml &&\ sed -i 's/#channel = "dev"/channel = "nightly"/' config.toml &&\ sed -i 's/#llvm-config = (path)/llvm-config = "\/repos\/llvm-16.0-2023-03-06\/build\/bin\/llvm-config"/' config.toml &&\ sed -i 's/#llvm-filecheck = "\/path\/to\/llvm-version\/bin\/FileCheck"/llvm-filecheck = "\/repos\/llvm-16.0-2023-03-06\/build\/bin\/FileCheck"/' config.toml &&\ - sed -i 's/#target = build.host (list of triples)/target = ["x86_64-unknown-linux-gnu"]/' config.toml -# sed -i 's/#target = build.host (list of triples)/target = ["x86_64-unknown-linux-gnu", "x86_64-pc-windows-gnu"]/' config.toml + sed -i 's/#target = build.host (list of triples)/target = ["x86_64-unknown-linux-gnu", "x86_64-pc-windows-gnu"]/' config.toml # build rust compiler -#RUN python3 x.py build --target x86_64-unknown-linux-gnu,x86_64-pc-windows-gnu -RUN python3 x.py build --target x86_64-unknown-linux-gnu +RUN python3 x.py build --target x86_64-unknown-linux-gnu,x86_64-pc-windows-gnu # build cargo #RUN python3 x.py build tools/cargo @@ -119,7 +117,6 @@ RUN bash rustup.sh RUN rustup toolchain list --verbose # rustup link our custom OLLVM toolchain, make it default -# RUN rustup toolchain link ollvm-rust-1.70.0 /repos/rust-1.70.0/build/x86_64-pc-windows-gnu/stage1/ RUN rustup toolchain link ollvm-rust-1.70.0 /repos/rust-1.70.0/build/x86_64-unknown-linux-gnu/stage1/ &&\ rustup default ollvm-rust-1.70.0