From a94cbfc456b391e91bc96f3a3b0903d6977ad103 Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Fri, 6 Oct 2023 00:04:24 -0400 Subject: [PATCH] fix(rust) --- projects/rust-lang.org/package.yml | 31 ++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/projects/rust-lang.org/package.yml b/projects/rust-lang.org/package.yml index ffbc44d5..612b3e5c 100644 --- a/projects/rust-lang.org/package.yml +++ b/projects/rust-lang.org/package.yml @@ -44,27 +44,30 @@ build: openssl.org: '*' # needed to build openssl-sys freedesktop.org/pkg-config: ^0.29 crates.io/semverator: 0 - script: |- + linux: + gnu.org/make: '*' + script: # --enable-optimize not available as of 1.63.0 - if semverator satisfies '<1.63' {{ version }}; then - export ARGS="$ARGS --enable-optimize" - fi + - run: export ARGS="$ARGS --enable-optimize" + if: <1.63.0 # 1.68.0 introduced a regression w.r.t. CI builds # https://github.com/rust-lang/rust/issues/108959 - if semverator satisfies '>=1.68<1.70' {{ version }}; then - sed -i.bak -e 's/CiEnv::is_ci()/CiEnv::is_ci() \&\& config.rust_info.is_managed_git_subrepository()/' src/bootstrap/native.rs - rm src/bootstrap/native.rs.bak - fi + - run: | + sed -i.bak -e 's/CiEnv::is_ci()/CiEnv::is_ci() \&\& config.rust_info.is_managed_git_subrepository()/' native.rs + rm native.rs.bak + if: '>=1.68<1.70' + working-directory: src/bootstrap - ./configure $ARGS - make install + - ./configure $ARGS + - make install - for tool in $tools; do - ./x.py install $tool - done + - | + for tool in $tools; do + ./x.py install $tool + done - rm -rf {{prefix}}/share/doc + - rm -rf {{prefix}}/share/doc env: ARGS: - --enable-vendor