File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -71,9 +71,14 @@ echo "jobs option OK"
7171#
7272# Asserted by OBSERVING THE RESOLUTION, not by timing: a timing assertion on
7373# CI measures the runner's mood.
74- out=$( " $MCPP " build --release --toolchain gcc@16.1.0 2>&1 ) \
75- || { echo " --toolchain gcc failed:" ; echo " $out " ; exit 1; }
76- echo " $out " | grep -q ' Resolved gcc@16.1.0' \
74+ # The spec comes from THIS platform's own resolution, not a hard-coded
75+ # `gcc@16.1.0`: the fixture pins llvm on macOS and Windows, and asserting a
76+ # compiler that is not installed there tests the payload index, not the flag.
77+ own=$( " $MCPP " build --release 2>&1 | sed -n ' s/.*Resolved \([^ ]*\) .*/\1/p' | head -1)
78+ [ -n " $own " ] || { echo " could not learn this platform's toolchain" ; exit 1; }
79+ out=$( " $MCPP " build --release --toolchain " $own " 2>&1 ) \
80+ || { echo " --toolchain $own failed:" ; echo " $out " ; exit 1; }
81+ echo " $out " | grep -q " Resolved $own " \
7782 || { echo " --toolchain did not reach toolchain resolution:" ; echo " $out " ; exit 1; }
7883
7984# ...and it must BEAT the manifest, or it is not an override. The fixture pins
You can’t perform that action at this time.
0 commit comments