Make the profile decide the float ABI it names

The staged executor takes the profile from the lock, requires it, and then
dropped it -- the comment where it landed said as much: "profile is required
but not yet consumed: no profile -> VITASDK_FLOAT_ABI mapping exists in
CMakeLists.txt yet". So `describe --profile vita-softfp` produced a lock that
said softfp and a toolchain that was hard-float, and nothing anywhere said
the two disagreed.

Profiles.cmake already names the worlds this tree publishes, so it is where
the ABI each of them bakes in belongs, next to the name. CMakeLists takes
VITASDK_PROFILE, refuses one the tree does not publish, and derives the float
ABI and the world's arch from it; build-host.sh passes it in both cmake
invocations, since stage 1 builds the sysroot the later stages import.

A profile wins over VITASDK_FLOAT_ABI, and silently. CMake cannot tell a
cache entry left at its default from one somebody passed, so a check that the
two agree would either miss -DVITASDK_FLOAT_ABI=hard or refuse every
re-configure of an existing build directory. Passing both is passing the same
thing twice.

The test runs stage 1 against a cmake that records its arguments, which is
what the flag being parsed and dropped would have failed.

Author: frangarcj

CMakeLists.txt

@@ -99,6 +99,30 @@ set(target_arch arm-vita-eabi)
 set(VITASDK_FLOAT_ABI "hard" CACHE STRING
     "Float ABI baked into the toolchain: hard (default) or softfp")
 set_property(CACHE VITASDK_FLOAT_ABI PROPERTY STRINGS hard softfp)
+
+# A profile names a world, and the world decides the ABI rather than the other
+# way round: CI asks for a profile because that is what the lock carries, and
+# describe already refuses one this repository does not publish.
+#
+# A profile wins over VITASDK_FLOAT_ABI, and does so silently. CMake cannot
+# tell a cache entry left at its default from one somebody passed, so a check
+# that the two agree would either miss -DVITASDK_FLOAT_ABI=hard or refuse
+# every re-configure of an existing build directory. Passing both is passing
+# the same thing twice; the profile is the one that says which world this is.
+include(Profiles)
+set(VITASDK_PROFILE "" CACHE STRING "World to build; selects the float ABI")
+if(VITASDK_PROFILE)
+    if(NOT VITASDK_PROFILE IN_LIST VITASDK_PROFILES)
+        message(FATAL_ERROR
+            "unknown profile '${VITASDK_PROFILE}'; this tree publishes: ${VITASDK_PROFILES}")
+    endif()
+    set(profile_float_abi ${VITASDK_PROFILE_FLOAT_ABI_${VITASDK_PROFILE}})
+    if(NOT profile_float_abi)
+        message(FATAL_ERROR "profile '${VITASDK_PROFILE}' declares no float ABI")
+    endif()
+    set(VITASDK_FLOAT_ABI ${profile_float_abi} CACHE STRING "" FORCE)
+endif()
+
 if(NOT VITASDK_FLOAT_ABI STREQUAL "hard" AND NOT VITASDK_FLOAT_ABI STREQUAL "softfp")
     message(FATAL_ERROR "VITASDK_FLOAT_ABI must be 'hard' or 'softfp', got '${VITASDK_FLOAT_ABI}'")
 endif()

cmake/Profiles.cmake

@@ -2,3 +2,9 @@ include_guard(GLOBAL)
 
 # Published profile (world) names; describe rejects anything else.
 set(VITASDK_PROFILES vita vita-softfp)
+
+# The float ABI each profile bakes into the toolchain. A profile is a world and
+# a world is named by the architecture its packages carry, so the name is the
+# same on both sides of the build.
+set(VITASDK_PROFILE_FLOAT_ABI_vita hard)
+set(VITASDK_PROFILE_FLOAT_ABI_vita-softfp softfp)

scripts/ci/build-host.sh

@@ -71,9 +71,6 @@ for required in host stage artifacts_dir out_dir build_id version revision profi
 		exit 2
 	}
 done
-# profile is required but not yet consumed: no profile -> VITASDK_FLOAT_ABI
-# mapping exists in CMakeLists.txt yet.
-: "$profile"
 
 actual_revision=$(git -C "$repo_root" rev-parse HEAD)
 [[ $actual_revision == "$revision" ]] || {
@@ -175,6 +172,9 @@ build_and_stage() {
 	local -a extra_args=("$@")
 	local -a cmake_args=(
 		-S "$repo_root" -B build ${extra_args[@]+"${extra_args[@]}"}
+		# The lock says which world this is; the profile is how the tree is
+		# told, and it is what decides the float ABI baked into the toolchain.
+		-DVITASDK_PROFILE="$profile"
 		-DVITASDK_SOURCE_REVISION="$revision"
 		-DVITASDK_SOURCE_DATE_EPOCH="$source_date_epoch"
 		# The lock names the host; artifacts published under any other name
@@ -363,6 +363,7 @@ if [[ $stage == 1 ]]; then
 	enable_ccache
 	cmake -S "$repo_root" -B build \
 		-DVITASDK_TARGET_ONLY=ON \
+		-DVITASDK_PROFILE="$profile" \
 		-DVITASDK_SOURCE_REVISION="$revision" \
 		-DVITASDK_SOURCE_DATE_EPOCH="$source_date_epoch"
 	cmake --build build --target sysroot --parallel "$(ci_nproc)"

tests/ci/test-build-host-args.sh

@@ -124,4 +124,28 @@ grep -q 'curl disabled in test' <<< "$output" || {
 	exit 1
 }
 
+# 6. The profile reaches cmake. The lock is where CI says which world it is
+# building, and the profile is the only thing that carries it into the tree;
+# until this existed the flag was parsed, required, and then dropped, so a
+# softfp lock produced a hard-float toolchain that said nothing.
+recorded="$temporary_directory/cmake-args"
+cat > "$fake_bin/cmake" <<EOF
+#!/usr/bin/env bash
+printf '%s\n' "\$@" >> "$recorded"
+exit 0
+EOF
+chmod +x "$fake_bin/cmake"
+
+run_build_host \
+	--host x86_64-linux-gnu --stage 1 \
+	--artifacts-dir "$temporary_directory/artifacts-6" --out-dir "$temporary_directory/out-6" \
+	--build-id sha256:test --version 0.1.1 --revision "$revision" \
+	--profile vita-softfp --packaged false >/dev/null 2>&1 || true
+
+grep -qx -- '-DVITASDK_PROFILE=vita-softfp' "$recorded" || {
+	printf 'stage 1 did not pass the profile to cmake:\n%s\n' "$(cat "$recorded")" >&2
+	exit 1
+}
+rm -f "$fake_bin/cmake" "$recorded"
+
 printf 'build-host.sh argument contract tests passed\n'