Skip to content

Commit

Permalink
vax: handle (more correctly) a directory as --force-output arg
Browse files Browse the repository at this point in the history
Signed-off-by: Marc Poulhiès <[email protected]>
  • Loading branch information
dkm committed Nov 16, 2023
1 parent 6fc3062 commit 4a6df5c
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions build/build-vax-netbsd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,15 @@ popd
# Package newly built compiler.
gcc_name="gcc-${gcc_target}-${gcc_version}-${nb_actual_timestamp}"
gcc_tarball="${workdir}/${gcc_name}.tar.xz"
[ -z "${forced_output_filename}" ] || gcc_tarball="${forced_output_filename}"
[ -d "${forced_output_filename}" ] || gcc_tarball="${forced_output_filename}/${gcc_tarball}"

if [ -z "${forced_output_filename}" ]; then
gcc_tarball="${forced_output_filename}"
elif [ -d "${forced_output_filename}" ]; then
gcc_tarball="${forced_output_filename}/${gcc_name}.tar.xz"
else
gcc_tarball="${forced_output_filename}"
fi

gcc_destdir="${workdir}/${gcc_name}"
gcc_destdir_sysroot="${gcc_destdir}/${gcc_target}-sysroot"
mkdir -p "${gcc_destdir}"
Expand Down

0 comments on commit 4a6df5c

Please sign in to comment.