aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2016-09-06 15:58:29 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2016-09-06 15:58:29 +0200
commit92974a5e5a81ac1781d3fd58f6299f142dafb0cc (patch)
tree6a66812587a18f9ecc845ea12e974e836fe0c526
parentf3a04a50d8baa82c08d6f9d980dc5bec0039153d (diff)
Fix bootstrap.sh to avoid multiple directory slashes
-rwxr-xr-xbootstrap.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/bootstrap.sh b/bootstrap.sh
index 1f89810..ba245de 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -44,7 +44,7 @@ while test $# -ne 0; do
diag "error: libbutl directory '$1' does not exist"
exit 1
fi
- libbutl="$1"
+ libbutl="${1%/}"
shift
;;
--host)
@@ -92,6 +92,7 @@ if test -z "$libbutl"; then
libbutl="libbutl"
else
libbutl="$(echo libbutl-*/)"
+ libbutl="${libbutl%/}"
if test ! -d "$libbutl"; then
libbutl=
fi
@@ -103,6 +104,7 @@ if test -z "$libbutl"; then
libbutl="../libbutl"
else
libbutl="$(echo ../libbutl-*/)"
+ libbutl="${libbutl%/}"
if test ! -d "$libbutl"; then
libbutl=
fi
@@ -128,4 +130,4 @@ src="$src build2/pkgconfig/*.cxx"
src="$src $libbutl/butl/*.cxx"
set -x
-"$cxx" -I"$libbutl" -I. '-DBUILD2_HOST_TRIPLET="'"$host"'"' -std=c++1y "$@" -o build2/b-boot $src
+"$cxx" "-I$libbutl" -I. '-DBUILD2_HOST_TRIPLET="'"$host"'"' -std=c++1y "$@" -o build2/b-boot $src