Adjust URL

generate_matrix.py

@@ -85,11 +85,11 @@
 def cross_template(arch, subarch="", env="gnu", vendor="unknown", sys_os="linux", compilers=None, host_dict=None):
     compilers = compilers or {"C": "gcc", "C++": "g++"}
     host_dict = host_dict or hosts.get(f"{sys_os}-{'gnu' if env.startswith('gnu') else env}", {})
-    #cc =  f"{arch}-{sys_os}-{env}-{compilers['C']}"
-    #cxx = f"{arch}-{sys_os}-{env}-{compilers['C++']}"
-    ### ARM toolchain
-    cc =  f"{arch}-none-{sys_os}-{env}-{compilers['C']}"
-    cxx = f"{arch}-none-{sys_os}-{env}-{compilers['C++']}"
+    cc =  f"{arch}-{sys_os}-{env}-{compilers['C']}"
+    cxx = f"{arch}-{sys_os}-{env}-{compilers['C++']}"
+    #### ARM toolchain
+    #cc =  f"{arch}-none-{sys_os}-{env}-{compilers['C']}"
+    #cxx = f"{arch}-none-{sys_os}-{env}-{compilers['C++']}"
     #pkgs = " ".join((
         #f"{compiler}-{arch}-{sys_os}-{env}" for compiler in compilers.values()
         #))

util.sh

@@ -168,20 +168,24 @@ install_rust () {
 
 download_arm_toolchain () {
 	#ver=${1:-10.3-2021.07}
-	ver=${1:-8.2-2019.01}
+	#ver=${1:-8.2-2019.01}
+	ver=${1:-8.2-2018.11}
 	#fbname=gcc-arm-$ver-x86_64-aarch64-none-linux-gnu
-	fbname=gcc-arm-$ver-x86_64-arm-none-linux-gnueabihf
+	#fbname=gcc-arm-$ver-x86_64-arm-none-linux-gnueabihf
+	fbname=gcc-arm-$ver-x86_64-arm-linux-gnueabihf
 	fname=$fbname.tar.xz
 	#toolchain_path=/usr/aarch64-linux-gnu
 	toolchain_path=/usr/arm-linux-gnueabihf
-	curl -LO https://developer.arm.com/-/media/Files/downloads/gnu-a/$ver/binrel/$fname
+	#curl -LO https://developer.arm.com/-/media/Files/downloads/gnu-a/$ver/binrel/$fname
+	curl -LO https://developer.arm.com/-/media/Files/downloads/gnu-a/$ver/$fname
 	tar -xJf $fname
 	mv $fbname $toolchain_path
 	ls $toolchain_path/bin
 	export PATH=$toolchain_path/bin:$PATH
 	echo "$toolchain_path/bin" >> "$GITHUB_PATH"
 	#aarch64-none-linux-gnu-gcc --version
-	arm-none-linux-gnueabihf-gcc --version
+	#arm-none-linux-gnueabihf-gcc --version
+	arm-linux-gnueabihf-gcc --version
 }
 
 install_dependencies_deb () {