diff options
| author | Arnout Vandecappelle <arnout@mind.be> | 2017-07-07 09:43:30 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-07-07 09:57:14 +0200 |
| commit | 015d68c84c9c6ad6f6d41f181d19d813f309088b (patch) | |
| tree | 20d7e6b966de3f3ce272d4081ef6ca009f92f685 | |
| parent | 5c44c6b24d3d220c4e18600abcebdc5dfa26cdf1 (diff) | |
| download | buildroot-015d68c84c9c6ad6f6d41f181d19d813f309088b.tar.gz buildroot-015d68c84c9c6ad6f6d41f181d19d813f309088b.zip | |
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) <arnout@mind.be>
Cc: Mark Jackson <mpfj-list@newflow.co.uk>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | toolchain/toolchain-wrapper.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } } |
