From 015d68c84c9c6ad6f6d41f181d19d813f309088b Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Fri, 7 Jul 2017 09:43:30 +0200 Subject: [PATCH] toolchain-wrapper: fix breakage after host/usr removal The toolchain wrapper, when called through PATH, strips the last three levels of /proc/self/exe to find HOST_DIR. However, after the host/usr removal, this should be just two levels. The toolchain wrapper has different logic for when it is called with a full path (i.e. $HOST_DIR/usr/bin/arm-linux-gcc) then when it is called through the PATH (i.e. just arm-linux-gcc). The latter is never used internally in Buildroot, that's why this wasn't discovered through testing. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Cc: Mark Jackson Signed-off-by: Thomas Petazzoni --- toolchain/toolchain-wrapper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c index 3a4455ff82..a73e6d6f94 100644 --- a/toolchain/toolchain-wrapper.c +++ b/toolchain/toolchain-wrapper.c @@ -192,7 +192,7 @@ int main(int argc, char **argv) for (i = ret; i > 0; i--) { if (absbasedir[i] == '/') { absbasedir[i] = '\0'; - if (++count == 3) + if (++count == 2) break; } } -- 2.30.2