Pin build and dist directories

Author: jwnrt

.github/workflows/toolchain_build.yml

@@ -27,14 +27,12 @@ jobs:
           - name: rv32imcb
             display_name: RV32IMCB toolchains (Ibex)
             target: riscv32-unknown-elf
-            output_dir: /tools/riscv
             march: rv32imc_zba_zbb_zbc_zbs
             mabi: ilp32
             mcmodel: medany
           - name: rv64imac
             display_name: RV64IMAC toolchains (Muntjac)
             target: riscv64-unknown-elf
-            output_dir: /tools/riscv
             march: rv64imac
             mabi: lp64
             mcmodel: medany
@@ -74,17 +72,14 @@ jobs:
 
       - name: Build Binutils
         run: |
-          ./build-binutils.sh \
-            "${{ matrix.target }}" \
-            "${{ matrix.output_dir }}"
+          ./build-binutils.sh "${{ matrix.target }}"
 
       - name: Build Clang toolchain
         run: |
           ./build-clang-with-args.sh \
             "lowrisc-toolchain-${{ matrix.name }}" \
             Release \
             "${{ matrix.target }}" \
-            "${{ matrix.output_dir }}" \
             "${{ matrix.march }}" \
             "${{ matrix.mabi}}" \
             "${{ matrix.mcmodel }}" \
@@ -94,7 +89,6 @@ jobs:
         run: |
           ./create-prefixed-archive.sh \
             "lowrisc-toolchain-${{ matrix.name }}-${HOST_ARCH}-${RELEASE_TAG}" \
-            "${{ matrix.output_dir }}" \
             "${ARTIFACT_STAGING_DIR}"
 
       - uses: actions/upload-artifact@v4

build-binutils.sh

@@ -16,14 +16,15 @@ set -e -o pipefail
 repo_dir="$(git rev-parse --show-toplevel)"
 build_dir="${repo_dir}/build"
 patch_dir="${repo_dir}/patches"
+dist_dir="${build_dir}/dist"
 
 source "${repo_dir}/sw-versions.sh"
 
-if [ "$#" -ne 2 ] || [ "$1" == "-h" ] || [ "$1" == "--help" ]; then
-  echo "USAGE: $0 <target> <dist dir>"    >&2
-  echo                                    >&2
-  echo "EXAMPLE:"                         >&2
-  echo "  $0 riscv32 dist/"               >&2
+if [ "$#" -ne 1 ] || [ "$1" == "-h" ] || [ "$1" == "--help" ]; then
+  echo "USAGE: $0 <target>" >&2
+  echo                      >&2
+  echo "EXAMPLE:"           >&2
+  echo "  $0 riscv32"       >&2
   exit 1
 fi
 
@@ -40,9 +41,6 @@ fi
 
 set -x
 
-dist_dir="$(realpath "$2")"
-mkdir -p "$dist_dir"
-
 mkdir -p "$build_dir"
 cd "$build_dir"
 
@@ -60,6 +58,8 @@ git apply "${patch_dir}/binutils/"*
 mkdir -p build
 cd build
 
+mkdir -p "$dist_dir"
+
 # NOTE: We don't want to require `libexpat` to be dynamically linked.
 # It turns out to be quite hard to statically link *only* `libexpat`.
 ../configure \

build-clang-with-args.sh

@@ -22,37 +22,36 @@ if ! [ "$#" -ge 3 ]; then
   exit 2
 fi;
 
+repo_dir="$(git rev-parse --show-toplevel)"
+build_dir="${repo_dir}/build"
+dist_dir="${build_dir}/dist"
+
 ## Take configuration from arguments
 # This is the name for the tar file.
 toolchain_name="${1}"
 # This is the CMake build type (e.g. Release, Debug, RelWithDebInfo)
 build_type="${2}"
 # This is the expected target triple (so we can set a default)
 toolchain_target="${3}"
-# This is the directory where we want the toolchain to added to
-toolchain_dest="${4}"
 # -march option default value
-march="${5}"
+march="${4}"
 # -mabi option default value
-mabi="${6}"
+mabi="${5}"
 # -mcmodel option default value
-mcmodel="${7}"
+mcmodel="${6}"
 # Remaining cflags for build configurations
-toolchain_cflags=("${@:8}")
-
-build_top_dir="${PWD}"
+toolchain_cflags=("${@:7}")
 
 # For *_VERSION variables
 # shellcheck source=sw-versions.sh
-source "${build_top_dir}/sw-versions.sh"
+source "${repo_dir}/sw-versions.sh"
 
 tag_name="${RELEASE_TAG:-HEAD}"
 
-mkdir -p "${build_top_dir}/build"
-cd "${build_top_dir}/build"
-
+mkdir -p "$build_dir"
+cd "$build_dir"
 
-llvm_dir="${build_top_dir}/build/llvm-project"
+llvm_dir="${build_dir}/llvm-project"
 if [ ! -d "$llvm_dir" ]; then
   git clone "$LLVM_URL" "$llvm_dir" \
     --branch "$LLVM_BRANCH" \
@@ -69,7 +68,7 @@ clang_links_to_create+=";${toolchain_target}-clang;${toolchain_target}-clang++"
 lld_links_to_create="ld.lld;ld64.lld"
 lld_links_to_create+=";${toolchain_target}-ld.lld;${toolchain_target}-ld64.lld"
 
-llvm_build_dir="${build_top_dir}/build/llvm-build"
+llvm_build_dir="${build_dir}/llvm-project/build"
 
 # Delete old build artifacts (if they exist)
 rm -rf "${llvm_build_dir}"
@@ -109,7 +108,7 @@ llvm_distribution_components+=";${llvm_tools}"
 cmake "${llvm_dir}/llvm" \
   -Wno-dev \
   -DCMAKE_BUILD_TYPE="${build_type}" \
-  -DCMAKE_INSTALL_PREFIX="${toolchain_dest}" \
+  -DCMAKE_INSTALL_PREFIX="${dist_dir}" \
   -DLLVM_TARGETS_TO_BUILD="RISCV" \
   -DLLVM_ENABLE_PROJECTS="clang;lld;clang-tools-extra" \
   -DLLVM_ENABLE_BACKTRACES=Off \
@@ -130,22 +129,22 @@ cmake --build "${llvm_build_dir}" \
   --parallel $(( $(nproc) + 2 )) \
   --target install-distribution
 
-cd "${build_top_dir}"
+cd "${repo_dir}"
 
 # Copy LLVM licenses into toolchain
-mkdir -p "${toolchain_dest}/share/licenses/llvm"
-cp "${llvm_dir}/llvm/LICENSE.TXT" "${toolchain_dest}/share/licenses/llvm"
+mkdir -p "${dist_dir}/share/licenses/llvm"
+cp "${llvm_dir}/llvm/LICENSE.TXT" "${dist_dir}/share/licenses/llvm"
 
-ls -l "${toolchain_dest}"
+ls -l "${dist_dir}"
 
 # Write out build info
 set +o pipefail # head causes pipe failures, so we have to switch off pipefail while we use it.
 ct_ng_version_string="$( (set +o pipefail; ct-ng version | head -n1) )"
-clang_version_string="$("${toolchain_dest}/bin/clang" --version | head -n1)"
+clang_version_string="$("${dist_dir}/bin/clang" --version | head -n1)"
 build_date="$(date -u)"
 set -o pipefail
 
-tee "${toolchain_dest}/buildinfo" <<BUILDINFO
+tee "${dist_dir}/buildinfo" <<BUILDINFO
 Report toolchain bugs to [email protected] (include this file)
 
 lowRISC toolchain config:  ${toolchain_name}
@@ -165,7 +164,7 @@ C Flags:
 Built at ${build_date} on $(hostname)
 BUILDINFO
 
-tee "${toolchain_dest}/buildinfo.json" <<BUILDINFO_JSON
+tee "${dist_dir}/buildinfo.json" <<BUILDINFO_JSON
 {
   "toolchain_config": "${toolchain_name}",
   "kind": "combined",

create-prefixed-archive.sh

@@ -12,20 +12,23 @@ set -e
 set -x
 set -o pipefail
 
-if ! [ "$#" = 3 ]; then
-  echo "Usage: $0 <toolchain_name> <toolchain_dest> <artifact_dir>"
+if ! [ "$#" = 2 ]; then
+  echo "Usage: $0 <toolchain_name> <artifact_dir>"
   exit 2
 fi;
 
+repo_dir="$(git rev-parse --show-toplevel)"
+build_dir="${repo_dir}/build"
+dist_dir="${build_dir}/dist"
+
 # These arguments are provided by `./build-*-with-args.sh`
 toolchain_full_name="$1"
-toolchain_dest="$2"
-artifact_dir="${3:-.}"
+artifact_dir="${2:-.}"
 
 tar -cJ \
   --show-transformed-names --verbose \
-  --directory="$(dirname "${toolchain_dest}")" \
-  -f "${artifact_dir}/$toolchain_full_name.tar.xz" \
-  --transform="flags=rhS;s@^$(basename "${toolchain_dest}")@$toolchain_full_name@" \
+  --directory="$(dirname "$dist_dir")" \
+  -f "${artifact_dir}/${toolchain_full_name}.tar.xz" \
+  --transform="flags=rhS;s@^$(basename "$dist_dir")@${toolchain_full_name}@" \
   --owner=0 --group=0 \
-  "$(basename "${toolchain_dest}")"
+  "$(basename "$dist_dir")"