From 49e01fdf03019e4c86bafe868f2d73d44da98f2b Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Thu, 2 Jul 2020 13:52:31 +0300
Subject: Use config.install.private=build2 in build.sh for installing build2
 toolchain

---
 build.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/build.sh b/build.sh
index a8f5bb5..7ab3b67 100755
--- a/build.sh
+++ b/build.sh
@@ -253,10 +253,12 @@ sys="$(build2/config.guess | sed -n 's/^[^-]*-[^-]*-\(.*\)$/\1/p')"
 case "$sys" in
   mingw32 | mingw64 | msys | msys2 | cygwin)
     conf_rpath="[null]"
+    conf_rpath_stage="[null]"
     conf_sudo="[null]"
     ;;
   *)
-    conf_rpath="$idir/lib"
+    conf_rpath="$idir/lib/build2"
+    conf_rpath_stage="$idir/lib"
 
     if test -n "$sudo"; then
       conf_sudo="$sudo"
@@ -318,6 +320,7 @@ config.cc.coptions="$*" \
 config.bin.lib=shared \
 config.bin.rpath="$conf_rpath" \
 config.install.root="$idir" \
+config.install.private=build2 \
 config.install.sudo="$conf_sudo"
 
   run build2/build2/b-boot $verbose $jobs install: build2/ bpkg/ bdep/
@@ -344,7 +347,7 @@ run build2/build2/b-boot $verbose configure \
 config.cxx="$cxx" \
 config.bin.lib=shared \
 config.bin.suffix=-stage \
-config.bin.rpath="$conf_rpath" \
+config.bin.rpath="$conf_rpath_stage" \
 config.install.root="$idir" \
 config.install.data_root=root/stage \
 config.install.sudo="$conf_sudo"
@@ -371,6 +374,7 @@ config.cc.coptions="$*" \
 config.bin.lib=shared \
 config.bin.rpath="$conf_rpath" \
 config.install.root="$idir" \
+config.install.private=build2 \
 config.install.sudo="$conf_sudo"
 
 run bpkg-stage $verbose add "$BUILD2_REPO"
-- 
cgit v1.1