Add QNX specific configure.sh settings and use instance-id again for now

ferrocene · Apr 26, 2024 · 6d8fcd2 · 6d8fcd2
1 parent fcc32f1
commit 6d8fcd2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml
@@ -900,9 +900,7 @@ commands:
           command: echo 'source $(pwd)/qnx710/qnxsdp-env.sh' >> "$BASH_ENV"
       - run:
           name: Start QNX License Server port forwarding
-          command: |
-            INSTANCE=$(aws ec2 describe-instances --filters 'Name=tag:Name,Values=qnx-license-server' --output "text" --query 'Reservations[*].Instances[*].InstanceId')
-            aws ssm start-session --target ${INSTANCE} --document-name AWS-StartPortForwardingSession --parameters '{"portNumber":["56859"], "localPortNumber":["56859"]}'
+          command: aws ssm start-session --target i-0accef99ca2244097 --document-name AWS-StartPortForwardingSession --parameters '{"portNumber":["56859"], "localPortNumber":["56859"]}'
           background: true
 
   aws-oidc-auth:

diff --git a/ferrocene/ci/configure.sh b/ferrocene/ci/configure.sh
@@ -138,6 +138,17 @@ add --release-description="Ferrocene by Ferrous Systems"
 #                                                                            #
 ##############################################################################
 
+# QNX toolchains aren't automatically inferred, set them explicitly.
+#
+# Assumes `qnxsdp-env.sh` has been sourced or the binaries are otherwise
+# already on path
+add --set target.aarch64-unknown-nto-qnx710.cc=aarch64-unknown-nto-qnx7.1.0-gcc
+add --set target.aarch64-unknown-nto-qnx710.cxx=aarch64-unknown-nto-qnx7.1.0-g++
+add --set target.aarch64-unknown-nto-qnx710.ar=aarch64-unknown-nto-qnx7.1.0-ar
+add --set target.x86_64-pc-nto-qnx710.cc=x86_64-pc-nto-qnx7.1.0-gcc
+add --set target.x86_64-pc-nto-qnx710.cxx=x86_64-pc-nto-qnx7.1.0-g++
+add --set target.x86_64-pc-nto-qnx710.ar=x86_64-pc-nto-qnx7.1.0-ar
+
 # Set the host platform to build. The environment variable is set from the CI
 # configuration (see the .circleci directory).
 #

diff --git a/ferrocene/ci/docker-images/ubuntu-20/Dockerfile b/ferrocene/ci/docker-images/ubuntu-20/Dockerfile
@@ -45,6 +45,8 @@ RUN apt-get update \
         libc6-dev-arm64-cross \
         # Needed for thumbv7em-none-eabihf & armv8r-none-eabihf cross-compilation
         gcc-arm-none-eabi \
+        # Needed for riscv64gc-unknown-linux-gnu cross compilation
+        gcc-riscv64-linux-gnu \
         # Needed for the wasm32-unknown-unknown target
         clang \
         # Needed to install AWS CLI during the build: