Skip to content

Revert "ci: Bring back ninja for dist builders" #103846

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 3, 2022
Merged

Revert "ci: Bring back ninja for dist builders" #103846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ RUN yum upgrade -y && \
libstdc++-devel.x86_64 \
make \
ncurses-devel \
ninja-build \
openssl-devel \
patch \
perl \
Expand Down Expand Up @@ -65,6 +64,7 @@ ENV RUST_CONFIGURE_ARGS \
--enable-profiler \
--set target.i686-unknown-linux-gnu.linker=clang \
--build=i686-unknown-linux-gnu \
--set llvm.ninja=false \
--set rust.jemalloc
ENV SCRIPT python3 ../x.py dist --build $HOSTS --host $HOSTS --target $HOSTS
ENV CARGO_TARGET_I686_UNKNOWN_LINUX_GNU_LINKER=clang
Expand Down
2 changes: 1 addition & 1 deletion src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ RUN yum upgrade -y && \
libstdc++-devel.x86_64 \
make \
ncurses-devel \
ninja-build \
openssl-devel \
patch \
perl \
Expand Down Expand Up @@ -77,6 +76,7 @@ ENV RUST_CONFIGURE_ARGS \
--set target.x86_64-unknown-linux-gnu.ar=/rustroot/bin/llvm-ar \
--set target.x86_64-unknown-linux-gnu.ranlib=/rustroot/bin/llvm-ranlib \
--set llvm.thin-lto=true \
--set llvm.ninja=false \
--set rust.jemalloc \
--set rust.use-lld=true \
--set rust.lto=thin
Expand Down
5 changes: 2 additions & 3 deletions src/ci/docker/host-x86_64/dist-x86_64-linux/build-clang.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ INC="/rustroot/include:/usr/include"
# disable them. BOLT is used for optimizing LLVM.
hide_output \
cmake ../llvm \
-GNinja \
-DCMAKE_C_COMPILER=/rustroot/bin/gcc \
-DCMAKE_CXX_COMPILER=/rustroot/bin/g++ \
-DCMAKE_BUILD_TYPE=Release \
Expand All @@ -40,8 +39,8 @@ hide_output \
-DLLVM_ENABLE_PROJECTS="clang;lld;compiler-rt;bolt" \
-DC_INCLUDE_DIRS="$INC"

hide_output ninja
hide_output ninja install
hide_output make -j$(nproc)
hide_output make install

cd ../..
rm -rf llvm-project