diff options
| author | iancottrell@chromium.org <iancottrell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-28 17:25:50 +0000 |
|---|---|---|
| committer | iancottrell@chromium.org <iancottrell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-28 17:25:50 +0000 |
| commit | 8067c57c27ee5c0fcca31350c27281365ea662d5 (patch) | |
| tree | b2ad56f229bc27b2f293a1f598c5be87e29282a2 /tools/cr | |
| parent | 0167ff0d8b0e028ac84f31ffb7ed6714c767c560 (diff) | |
| download | chromium_src-8067c57c27ee5c0fcca31350c27281365ea662d5.zip chromium_src-8067c57c27ee5c0fcca31350c27281365ea662d5.tar.gz chromium_src-8067c57c27ee5c0fcca31350c27281365ea662d5.tar.bz2 | |
Add GOMA_DIR to the set of searched paths, and default it to something sensible (.)
BUG=
Review URL: https://codereview.chromium.org/212623012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260185 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/cr')
| -rw-r--r-- | tools/cr/cr/actions/ninja.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tools/cr/cr/actions/ninja.py b/tools/cr/cr/actions/ninja.py index 4485834..d2e77b0 100644 --- a/tools/cr/cr/actions/ninja.py +++ b/tools/cr/cr/actions/ninja.py @@ -12,6 +12,10 @@ _PHONY_SUFFIX = ': phony' _LINK_SUFFIX = ': link' +DEFAULT = cr.Config.From( + GOMA_DIR=os.path.expanduser('~/goma'), +) + class NinjaBuilder(cr.Builder): """An implementation of Builder that uses ninja to do the actual build.""" @@ -21,7 +25,6 @@ class NinjaBuilder(cr.Builder): NINJA_JOBS=10, NINJA_PROCESSORS=4, NINJA_BUILD_FILE=os.path.join('{CR_BUILD_DIR}', 'build.ninja'), - GOMA_DIR=os.path.join('{GOOGLE_CODE}', 'goma'), # Don't rename to GOMA_* or Goma will complain: "unkown GOMA_ parameter". NINJA_GOMA_LINE='cc = {CR_GOMA_CC} $', ) @@ -107,8 +110,10 @@ class NinjaBuilder(cr.Builder): cls.DETECTED.Set(NINJA_BINARY=ninja_binaries[0]) goma_binaries = cr.Host.SearchPath('gomacc', [ + '{GOMA_DIR}', '/usr/local/google/code/goma', - os.path.expanduser('~/goma')]) + os.path.expanduser('~/goma') + ]) if goma_binaries: cls.DETECTED.Set(CR_GOMA_DIR=os.path.dirname(goma_binaries[0])) cls.DETECTED.AddChildren(cls.GOMA) |