Unverified Commit 3a1d0f24 authored by Georg Koppen's avatar Georg Koppen
Browse files

Bug 40190: Update toolchain for Fenix 85 

We pick up the latest (currently) Rust stable version, 1.48.0.

miri fails to compile (even though the build succeeds) which is
okay-ish.

See:

https://github.com/rust-lang/rust/issues/79582 and
https://github.com/rust-lang/rust/issues/74709

for more details.

It's not clear why exactly we need to specify the host as a target now,
too. But I guess previously things just worked by chance. The correct
thing to do is to specify `x86_64-unknown-linux` as target, too, given
that we are targetting it, e.g. with `cbindgen`.

Note: we could think about specifying `--host` here too, but it seems we
can avoid that extra configure argument, see:

https://github.com/rust-lang/rust/issues/76990.
parent 3555cc99

projects/rust/build

+4 −0
Original line number Diff line number Diff line
@@ -4,6 +4,10 @@ distdir=/var/tmp/dist/[% project %] 
mkdir -p $distdir

tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %]

export PATH="/var/tmp/dist/cmake/bin:$PATH"

[% IF c("var/android") %]

  tar -C /var/tmp/dist -xf [% c('input_files_by_name/ninja') %]

  export PATH=/var/tmp/dist/ninja:$PATH

[% END %]

tar -C /var/tmp/dist -xf [% c('input_files_by_name/previous_rust') %]

cd /var/tmp/dist/rust-[% c('var/previous_version') %]-x86_64-unknown-linux-gnu

./install.sh --prefix=$distdir-rust-old

projects/rust/config

+6 −3
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ var: 
targets:

  android:

    var:

      current_version: 1.47.0

      previous_version: 1.46.0

      current_version: 1.48.0

      previous_version: 1.47.0

      arch_deps:

        - libssl-dev

        - pkg-config
@@ -21,7 +21,7 @@ targets: 


  android-armv7:

    var:

      configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=[% IF pc(c("origin_project"), "var/application_services") %]armv7-linux-androideabi[% ELSE %]thumbv7neon-linux-androideabi[% END %] --set=target.[% IF pc(c("origin_project"), "var/application_services") %]armv7-linux-androideabi[% ELSE %]thumbv7neon-linux-androideabi[% END %].cc=[% c("var/CC") %] --set=target.[% IF pc(c("origin_project"), "var/application_services") %]armv7-linux-androideabi[% ELSE %]thumbv7neon-linux-androideabi[% END %].ar=[% c("var/cross_prefix") %]-ar

      configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=x86_64-unknown-linux-gnu,[% IF pc(c("origin_project"), "var/application_services") %]armv7-linux-androideabi[% ELSE %]thumbv7neon-linux-androideabi[% END %] --set=target.[% IF pc(c("origin_project"), "var/application_services") %]armv7-linux-androideabi[% ELSE %]thumbv7neon-linux-androideabi[% END %].cc=[% c("var/CC") %] --set=target.[% IF pc(c("origin_project"), "var/application_services") %]armv7-linux-androideabi[% ELSE %]thumbv7neon-linux-androideabi[% END %].ar=[% c("var/cross_prefix") %]-ar



  linux:

    var:
@@ -83,6 +83,9 @@ input_files: 
  - project: container-image

  - project: cmake

    name: cmake

  - project: ninja

    name: ninja

    enable: '[% c("var/android") %]'

  - project: '[% c("var/compiler") %]'

    name: '[% c("var/compiler") %]'

  - URL: 'https://static.rust-lang.org/dist/rustc-[% c("var/current_version") %]-src.tar.gz'