cros_setup_toolchains: fix non-gold package building
The non-gold code path set up srcpath in a different way from the gold
code path causing the bundling to go wrong and not include wrappers for
the binutils tools. Fix that logic up so now it works for both.
BUG=chromium:380329, chromium:421172
TEST=created a mipsel package and checked the bin/ subdir for binutils tools
Change-Id: I5c7296a9f408004c99829ae88226a19c8248586f
Reviewed-on: https://chromium-review.googlesource.com/232021
Reviewed-by: Ben Chan <benchan@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
diff --git a/scripts/cros_setup_toolchains.py b/scripts/cros_setup_toolchains.py
index ed60330..9b8b126 100644
--- a/scripts/cros_setup_toolchains.py
+++ b/scripts/cros_setup_toolchains.py
@@ -835,8 +835,9 @@
else:
assert len(srcpath) == 1, '%s: did not match exactly 1 path' % globpath
gold_supported = True
+ srcpath = srcpath[0]
- srcpath = srcpath[0][len(output_dir):]
+ srcpath = srcpath[len(output_dir):]
gccpath = os.path.join('/usr', 'libexec', 'gcc')
for prog in os.listdir(output_dir + srcpath):
# Skip binaries already wrapped.