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

Unified Diff: scripts/slave/compile.py

Issue 507007: Adding Arm chromium builder to waterfall. (Closed) Base URL: svn://chrome-svn/chrome/trunk/tools/buildbot/
Patch Set: Created 11 years 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
« master.chromium/master.cfg ('K') | « master.chromium/slaves.cfg ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/compile.py
===================================================================
--- scripts/slave/compile.py (revision 34512)
+++ scripts/slave/compile.py (working copy)
@@ -54,7 +54,7 @@
return result
-def common_linux_settings(command, distcc_pump=False):
+def common_linux_settings(command, distcc_pump=False, crosstool=None):
"""
Sets desirable Linux environment variables and command-line options
that are common to the Make and SCons builds.
@@ -74,6 +74,17 @@
if distcc_pump:
return
+ # Setup crosstool environment variables.
+ if crosstool:
+ os.environ['AR'] = crosstool + '-ar'
+ os.environ['AS'] = crosstool + '-as'
+ os.environ['CC'] = crosstool + '-gcc'
+ os.environ['CXX'] = crosstool + '-g++'
+ os.environ['LD'] = crosstool + '-ld'
+ os.environ['RANLIB'] = crosstool + '-ranlib'
+ command.append('-j4')
+ return
+
jobs = 4
cc = 'gcc'
cpp = 'g++'
@@ -128,7 +139,7 @@
command = ['pump_chrome']
else:
command = ['make']
- common_linux_settings(command, options.distcc_pump)
+ common_linux_settings(command, options.distcc_pump, options.crosstool)
command.append('BUILDTYPE=' + options.target)
@@ -310,6 +321,9 @@
# Only works for make builds. Ask thestig if you're curious.
option_parser.add_option('', '--distcc-pump', action="store_true",
help='run distcc pump mode for local testing')
+ # For linux to arm cross compile.
+ option_parser.add_option('', '--crosstool', default=None,
+ help='optional path to crosstool toolset')
options, args = option_parser.parse_args()
« master.chromium/master.cfg ('K') | « master.chromium/slaves.cfg ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698