Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(577)

Unified Diff: parallel_emerge

Issue 3046009: fix toolchain location when using variants (Closed) Base URL: ssh://git@gitrw.chromium.org:9222//crosutils.git
Patch Set: . Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: parallel_emerge
diff --git a/parallel_emerge b/parallel_emerge
index 5b09ec6e428f8384160fe9624221555f5b30edc6..02237b7dea3105d5216a6647e8a7e10231025049 100755
--- a/parallel_emerge
+++ b/parallel_emerge
@@ -277,7 +277,10 @@ class DepGraphGenerator(object):
os.environ["SYSROOT"] = "/build/" + self.board
scripts_dir = os.path.dirname(os.path.realpath(__file__))
toolchain_path = "%s/../overlays/overlay-%s/toolchain.conf"
- f = open(toolchain_path % (scripts_dir, self.board))
+ # Strip the variant out of the board name to look for the toolchain. This
+ # is similar to what setup_board does.
+ board_no_variant = self.board.split('_')[0]
+ f = open(toolchain_path % (scripts_dir, board_no_variant))
os.environ["CHOST"] = f.readline().strip()
f.close()
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698