diff options
| author | dpranke <dpranke@chromium.org> | 2015-09-22 14:49:55 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-22 22:09:05 +0000 |
| commit | e0f6a916e895a301edbf408b77068caa963cce31 (patch) | |
| tree | 734b7413cc98b5b2395a8cede225e165995e5eec /mojo/BUILD.gn | |
| parent | 4be57da557544e360ab73add1c9a2828299725f8 (diff) | |
| download | chromium_src-e0f6a916e895a301edbf408b77068caa963cce31.zip chromium_src-e0f6a916e895a301edbf408b77068caa963cce31.tar.gz chromium_src-e0f6a916e895a301edbf408b77068caa963cce31.tar.bz2 | |
Various fixes for 32-bit Linux GN builds that need to be tracked down.
1) 64-bit gold linking doesn't work right
2) We need to compile d8 with the 32-bit clang toolchain to run
the js browser tests
3) parts of mojo depend on cython which depends on the python sdks
being present in the sysroot
4) we get errors trying to build the installer
R=brettw@chromium.org, mcgrathr@chromium.org
BUG=
Review URL: https://codereview.chromium.org/1359513002
Cr-Commit-Position: refs/heads/master@{#350243}
Diffstat (limited to 'mojo/BUILD.gn')
| -rw-r--r-- | mojo/BUILD.gn | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mojo/BUILD.gn b/mojo/BUILD.gn index 2bb0214..3c1431b 100644 --- a/mojo/BUILD.gn +++ b/mojo/BUILD.gn @@ -11,9 +11,15 @@ group("mojo") { ":tests", "//mojo/common", "//mojo/services", - "//third_party/mojo/src/mojo/public", ] + if (!(is_linux && target_cpu == "x86")) { + # TODO(GYP): Figure out if this needs to be supported. Right now + # it won't work on x86 official builds because it needs stuff in the + # sysroot that doesn't exist. + deps += [ "//third_party/mojo/src/mojo/public" ] + } + if (is_android) { deps += [ "//mojo/android" ] } |