Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 2/7] toolchain-wrapper: remove remaining references to HOST_DIR/usr
Date: Mon, 10 Jul 2017 01:21:18 +0200	[thread overview]
Message-ID: <20170709232123.30120-3-arnout@mind.be> (raw)
In-Reply-To: <20170709232123.30120-1-arnout@mind.be>

Commit 14151d77af20ec50eeba6e30465debf87b35faaa that eliminated
$(HOST_DIR)/usr seriously missed the toolchain-wrapper - only a single
reference was updated, the other three were missed. Commit
015d68c84c9c6ad6f6d41f181d19d813f309088b removed one more. This commit
finally removes the two remaining ones.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 toolchain/toolchain-wrapper.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c
index a73e6d6f94..c048992656 100644
--- a/toolchain/toolchain-wrapper.c
+++ b/toolchain/toolchain-wrapper.c
@@ -208,14 +208,14 @@ int main(int argc, char **argv)
 #elif defined(BR_CROSS_PATH_ABS)
 	ret = snprintf(path, sizeof(path), BR_CROSS_PATH_ABS "/%s" BR_CROSS_PATH_SUFFIX, basename);
 #else
-	ret = snprintf(path, sizeof(path), "%s/usr/bin/%s" BR_CROSS_PATH_SUFFIX, absbasedir, basename);
+	ret = snprintf(path, sizeof(path), "%s/bin/%s" BR_CROSS_PATH_SUFFIX, absbasedir, basename);
 #endif
 	if (ret >= sizeof(path)) {
 		perror(__FILE__ ": overflow");
 		return 3;
 	}
 #ifdef BR_CCACHE
-	ret = snprintf(ccache_path, sizeof(ccache_path), "%s/usr/bin/ccache", absbasedir);
+	ret = snprintf(ccache_path, sizeof(ccache_path), "%s/bin/ccache", absbasedir);
 	if (ret >= sizeof(ccache_path)) {
 		perror(__FILE__ ": overflow");
 		return 3;
-- 
2.13.2

  parent reply	other threads:[~2017-07-09 23:21 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-09 23:21 [Buildroot] [PATCH 0/7] More HOST_DIR/usr fixes Arnout Vandecappelle
2017-07-09 23:21 ` [Buildroot] [PATCH 1/7] Makefile: properly create $(HOST_DIR)/usr compatibility symlink Arnout Vandecappelle
2017-07-10 15:59   ` Thomas Petazzoni
2017-07-09 23:21 ` Arnout Vandecappelle [this message]
2017-07-10 15:59   ` [Buildroot] [PATCH 2/7] toolchain-wrapper: remove remaining references to HOST_DIR/usr Thomas Petazzoni
2017-07-09 23:21 ` [Buildroot] [PATCH 3/7] support/testing: strip /usr/ part from HOST_DIR Arnout Vandecappelle
2017-07-10 15:59   ` Thomas Petazzoni
2017-07-09 23:21 ` [Buildroot] [PATCH 4/7] support/testing: move BRTest initialisation to __init__ Arnout Vandecappelle
2017-07-10 15:59   ` Thomas Petazzoni
2017-07-09 23:21 ` [Buildroot] [PATCH 5/7] support/testing: add test of BR2_CCACHE with an external toolchain Arnout Vandecappelle
2017-07-10 16:01   ` Thomas Petazzoni
2017-07-10 20:10     ` Arnout Vandecappelle
2017-07-09 23:21 ` [Buildroot] [PATCH 6/7] Makefile: add check that $(HOST_DIR)/usr is not a directory Arnout Vandecappelle
2017-07-10 16:02   ` Thomas Petazzoni
2017-07-10 16:12     ` Yann E. MORIN
2017-07-10 19:51       ` Arnout Vandecappelle
2017-07-10 20:09         ` Arnout Vandecappelle
2017-07-10 21:27         ` Thomas Petazzoni
2017-07-10 21:36           ` Arnout Vandecappelle
2017-07-10 21:43             ` Yann E. MORIN
2017-07-09 23:21 ` [Buildroot] [PATCH 7/7] toolchain-external: default BR2_TOOLCHAIN_EXTERNAL_PATH to empty Arnout Vandecappelle
2017-07-10 16:03   ` Thomas Petazzoni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170709232123.30120-3-arnout@mind.be \
    --to=arnout@mind.be \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox