diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-24 02:40:06 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-24 02:40:06 +0000 |
| commit | cbc755e5a93924019cda7f46d533e90b0daf2e66 (patch) | |
| tree | e48ab6829efe20a36f00861d40824f705cdd7838 | |
| parent | fd09950346afe96c4d86d37d98fd45003872ab3f (diff) | |
| download | chromium_src-cbc755e5a93924019cda7f46d533e90b0daf2e66.zip chromium_src-cbc755e5a93924019cda7f46d533e90b0daf2e66.tar.gz chromium_src-cbc755e5a93924019cda7f46d533e90b0daf2e66.tar.bz2 | |
Temporarily disable the v8 *_arm targets on Linux so we can roll
this out while working on the right model to handle building
both variants.
Includes gyp DEPS roll to get fixes for latest Linux backend.
Review URL: http://codereview.chromium.org/52022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12336 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | build/temp_gyp/v8.gyp | 7 |
2 files changed, 8 insertions, 1 deletions
@@ -26,7 +26,7 @@ deps = { # TODO(mark): Remove once this has moved into depot_tools. "src/tools/gyp": - "http://gyp.googlecode.com/svn/trunk@390", + "http://gyp.googlecode.com/svn/trunk@395", "src/v8": "http://v8.googlecode.com/svn/trunk@1564", diff --git a/build/temp_gyp/v8.gyp b/build/temp_gyp/v8.gyp index 3991900..d2481f8 100644 --- a/build/temp_gyp/v8.gyp +++ b/build/temp_gyp/v8.gyp @@ -452,7 +452,13 @@ }], ], }, + ], + # TODO(sgk): temporarily disable the arm targets on Linux while + # we work out how to refactor the generator and/or add configuration + # settings to the .gyp file to handle building both variants in + # the same output directory. + 'conditions': [ ['OS!="linux"', { 'targets': [ # ARM targets, to test ARM code generation. These use an ARM simulator # (src/simulator-arm.cc). The ARM targets are not snapshot-enabled. { @@ -548,5 +554,6 @@ }], ], }, + ]}], # OS != "linux" (temporary, TODO(sgk)) ], } |