projects/gcc-cross/build

@@ -34,7 +34,7 @@ mkdir linux
 cd linux
 tar -xJf $rootdir/linux-[% c("var/linux_version") %].tar.xz
 cd linux-[% c("var/linux_version") %]
-make ARCH=[% c("arch") %] INSTALL_HDR_PATH=$distdir/[% c("var/gcc_target") %] headers_install
+make ARCH=[% c("kernel_arch") %] INSTALL_HDR_PATH=$distdir/[% c("var/gcc_target") %] headers_install
 
 #cd $rootdir
 cd /var/tmp/build

projects/gcc-cross/config

@@ -47,7 +47,7 @@ targets:
       configure_opt: --disable-multilib --enable-languages=c,c++ --target=[% c("var/gcc_target") %] --with-arch=armv7-a --with-fpu=vfpv3-d16 --with-float=hard --with-mode=thumb
   linux-arm64:
     var:
-      configure_opt: --disable-multilib --enable-languages=c,c++ --target=[% c("var/gcc_target") %] --with-arch=[% c("arch") %]
+      configure_opt: --disable-multilib --enable-languages=c,c++ --target=[% c("var/gcc_target") %] --with-arch=armv8-a
 input_files:
   - project: container-image
   - URL: 'https://ftp.gnu.org/gnu/gcc/gcc-[% c("version") %]/gcc-[% c("version") %].tar.xz'

projects/rust/config

@@ -95,6 +95,7 @@ input_files:
     sig_ext: asc
     file_gpg_id: 1
     gpg_keyring: rust.gpg
+    # part of workaround for armv7 build hosts:
     enable: '[% !c("var/host_arm") %]'
   - URL: 'https://static.rust-lang.org/dist/rust-[% c("var/prev_version") %]-arm-unknown-linux-gnueabihf.tar.xz'
     name: prev_rust
@@ -102,6 +103,7 @@ input_files:
     file_gpg_id: 1
     gpg_keyring: rust.gpg
     enable: '[% c("var/host_arm") %]'
+    # this input file serves as a workaround for armv7 build hosts, it will be obsolete latest as soon as prev_version reaches 1.34.0
   - filename: unwind.patch
     enable: '[% c("var/windows-i686") && !c("input_file_var/unwind_128") %]'
   - filename: unwind_128.patch

rbm.conf

@@ -41,9 +41,10 @@ var:
   container:
     dir: '[% c("rbm_tmp_dir") %]/rbm-containers/[% sha256(c("build_id")) %]'
     user: rbm
+    # By default assume building on x86_64
     arch: amd64
+  # By default assume building on x86_64
   rust_host: x86_64-unknown-linux-gnu
-  rust_target: '[% c("arch") %]-unknown-linux-gnu'
   gcc_target: '[% c("arch") %]-linux-gnu'
 
   input_files_list: |
@@ -228,11 +229,13 @@ targets:
   linux-x86_64:
     arch: x86_64
     var:
+      rust_target: x86_64-unknown-linux-gnu
       linux-x86_64: 1
       osname: linux-x86_64
   linux-i686:
     arch: i686
     var:
+      rust_target: i686-unknown-linux-gnu
       linux-i686: 1
       32bit: 1
       osname: linux-i686
@@ -245,29 +248,29 @@ targets:
            exec setarch i686 ./build
         fi
   linux-arm:
-    arch: arm
+    kernel_arch: arm
     var:
-      linux-arm: 1
-      32bit: 1
-      gcc-cross: 1
-      osname: linux-arm
       rust_target: armv7-unknown-linux-gnueabihf
       gcc_target: arm-linux-gnueabihf
       apt_arch: armhf
+      gcc-cross: 1
+      linux-arm: 1
+      32bit: 1
+      osname: linux-arm
       configure_opt: '--host=arm-linux-gnueabihf'
       # TODO: Maybe re-enable snowflake on linux-arm later?
       snowflake: 0
       # TODO: Maybe re-enable fteproxy on linux-arm later?
       fteproxy: 0
   linux-arm64:
-    arch: arm64
+    kernel_arch: arm64
     var:
-      linux-arm64: 1
-      gcc-cross: 1
-      osname: linux-arm64
       rust_target: aarch64-unknown-linux-gnu
       gcc_target: aarch64-linux-gnu
       apt_arch: arm64
+      gcc-cross: 1
+      linux-arm64: 1
+      osname: linux-arm64
       configure_opt: '--host=aarch64-linux-gnu'
   linux:
     var: