From f4f2d608d7b068d7a3d28bab2d8c7326878934c2 Mon Sep 17 00:00:00 2001 From: Nadav Har'El Date: Tue, 24 Jan 2023 15:23:22 +0200 Subject: [PATCH] dbuild: fix path in example in README The dbuild README has an example how to enable ccache, and required modifying the PATH. Since recently, our docker image includes required commands (cxxbridge) in /usr/local/bin, so the build will fail if that directory isn't also in the path - so add it in the example. Also use the opportunity to fix the "/home/nyh" in one example to "$HOME". Signed-off-by: Nadav Har'El Closes #12631 --- tools/toolchain/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/toolchain/README.md b/tools/toolchain/README.md index bc93a580bd..b2e903e1e1 100644 --- a/tools/toolchain/README.md +++ b/tools/toolchain/README.md @@ -26,7 +26,7 @@ command to be executed, separating the flags and the command with `--`. This can be useful to attach more volumes (for data or ccache) and to set environment variables. For example, to use ccache: - ./tools/toolchain/dbuild -e PATH=/usr/lib64/ccache:/usr/bin -v $HOME/.ccache:$HOME/.ccache:z -- ninja + ./tools/toolchain/dbuild -e PATH=/usr/lib64/ccache:/usr/bin:/usr/local/bin -v $HOME/.ccache:$HOME/.ccache:z -- ninja The above command works as follows: 1. Ccache comes pre-installed in the container, and the setting of PATH @@ -42,7 +42,7 @@ The above command works as follows: To pass the same options to every run of dbuild, put them in the file ~/.config/scylladb/dbuild, which should contain a bash array assignment: -SCYLLADB_DBUILD=(-e PATH=/usr/lib64/ccache:/usr/bin -v /home/nyh/.ccache:/home/nyh/.ccache:z) +SCYLLADB_DBUILD=(-e PATH=/usr/lib64/ccache:/usr/bin:/usr/local/bin -v $HOME/.ccache:$HOME/.ccache:z) The script also works from other directories, so if you have `scylla-ccm` checked out alongside scylla, you can write