aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md7
-rwxr-xr-xconfigure5
-rw-r--r--configure.ac4
3 files changed, 9 insertions, 7 deletions
diff --git a/README.md b/README.md
index 799234a..f063ded 100644
--- a/README.md
+++ b/README.md
@@ -35,6 +35,7 @@ By default, 64-bit (RV64) versions of `pk` and `bbl` are built. To
built 32-bit (RV32) versions, supply a `--enable-32bit` flag to the
configure command.
-The `install` step installs 64-bit build products into
-`$RISCV/riscv64-unknown-elf`, and 32-bit versions into
-`$RISCV/riscv32-unknown-elf`.
+The `install` step installs 64-bit build products into a directory
+matching your host (e.g. `$RISCV/riscv64-unknown-elf`). 32-bit versions
+are installed into a directory matching a 32-bit version of your host (e.g.
+`$RISCV/riscv32-unknown-elf`).
diff --git a/configure b/configure
index c0221d7..c83743f 100755
--- a/configure
+++ b/configure
@@ -4086,12 +4086,13 @@ case "${BUILD_32BIT}" in
echo "Building 32-bit pk"
CFLAGS="$default_CFLAGS -m32"
LDFLAGS="-m32"
- install_subdir="riscv32-unknown-elf"
+ install_subdir="`echo $host_alias | sed -e 's/64/32/g'`"
;;
*)
CFLAGS="$default_CFLAGS"
LDFLAGS=
- install_subdir="riscv64-unknown-elf"
+ install_subdir=$host_alias
+
;;
esac
diff --git a/configure.ac b/configure.ac
index 7ab8a88..7b7c61a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,12 +90,12 @@ case "${BUILD_32BIT}" in
echo "Building 32-bit pk"
CFLAGS="$default_CFLAGS -m32"
LDFLAGS="-m32"
- install_subdir="riscv32-unknown-elf"
+ install_subdir="`echo $host_alias | sed -e 's/64/32/g'`"
;;
*)
CFLAGS="$default_CFLAGS"
LDFLAGS=
- install_subdir="riscv64-unknown-elf"
+ install_subdir=$host_alias
;;
esac