[meson] Put Toolchain Config into build-out
This commit moves the toolchain configuration file (which is created if
you use an old or non-standard toolchain) into `build-out` rather than
putting it into `/tmp`. It also ensures it has a timestamp that matches
that of the original `toolchain.txt` as committed to the repo. This
should prevent meson build loops, as noted in #2428
Signed-off-by: Sam Elliott <selliott@lowrisc.org>
diff --git a/meson_init.sh b/meson_init.sh
index 81ebd4d..2ccc75c 100755
--- a/meson_init.sh
+++ b/meson_init.sh
@@ -131,21 +131,6 @@
fi
fi
-if [[ -f "${ARG_toolchain_file}" ]]; then
- echo "Using meson toolchain file at $ARG_toolchain_file." >&2
-else
- if [[ "${FLAGS_specified_toolchain_file}" == true ]]; then
- echo "Unable to find meson toolchain file at $ARG_toolchain_file. Aborting." >&2
- exit 1
- else
- cross_file=$(mktemp /tmp/toolchain.XXXXXX.txt)
- cp toolchain.txt "$cross_file"
- perl -pi -e "s#$DEFAULT_RISCV_TOOLS#$TOOLCHAIN_PATH#g" "$cross_file"
- echo "Set up toolchain file at $cross_file." >&2
- ARG_toolchain_file="${cross_file}"
- fi
-fi
-
reconf="${FLAGS_reconfigure}"
if [[ ! -d "$OBJ_DIR" ]]; then
@@ -156,6 +141,22 @@
echo "Output directory already exists at $OBJ_DIR; skipping." >&2
fi
+if [[ -f "${ARG_toolchain_file}" ]]; then
+ echo "Using meson toolchain file at $ARG_toolchain_file." >&2
+else
+ if [[ "${FLAGS_specified_toolchain_file}" == true ]]; then
+ echo "Unable to find meson toolchain file at $ARG_toolchain_file. Aborting." >&2
+ exit 1
+ else
+ cross_file="$OBJ_DIR/toolchain-configured.txt"
+ cp toolchain.txt "$cross_file"
+ perl -pi -e "s#$DEFAULT_RISCV_TOOLS#$TOOLCHAIN_PATH#g" "$cross_file"
+ touch -r toolchain.txt "$cross_file"
+ echo "Set up toolchain file at $cross_file." >&2
+ ARG_toolchain_file="${cross_file}"
+ fi
+fi
+
mkdir -p "$DEV_BIN_DIR"
set -x
meson $reconf \
