diff options
| author | scottbyer@chromium.org <scottbyer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-08 17:51:33 +0000 |
|---|---|---|
| committer | scottbyer@chromium.org <scottbyer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-08 17:51:33 +0000 |
| commit | 34799f9d2314ea8ae20ab4e9ad805da8f82b327f (patch) | |
| tree | 6a9d0a18f8fdc08acf43e0374e96c3edba2e45ed /build/common.gypi | |
| parent | 63597e4ebc117bb561b93f4d775d787120e6728a (diff) | |
| download | chromium_src-34799f9d2314ea8ae20ab4e9ad805da8f82b327f.zip chromium_src-34799f9d2314ea8ae20ab4e9ad805da8f82b327f.tar.gz chromium_src-34799f9d2314ea8ae20ab4e9ad805da8f82b327f.tar.bz2 | |
install-build-deps.sh fixes for Lucid and Chromium OS.
Add in two extra libraries needed for building Chromium-for-Chromium OS on a fresh install Ubuntu Lucid 64-bit. Also, start checking for header differences between the 32-bit and 64-bit packages, adding those headers into the 32-bit cons'ed up package install (on Lucid Lynx, the current libcurl4-gnutls-dev package needs this). Clean up any leftover symbolic links that point nowhere. Also take any declared package conflicts and remove them from the Provides line to allow the cons'ed up package to always install (the package derived from libcurl4-gnutls-dev).
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/2865032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51863 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi index 6a95c4f..8a8d1fb 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -1007,6 +1007,16 @@ '-msse2', ], }], + # Install packages have started cropping up with + # different headers between the 32-bit and 64-bit + # versions, so we have to shadow those differences off + # and make sure a 32-bit-on-64-bit build picks up the + # right files. + ['host_arch!="ia32"', { + 'include_dirs+': [ + '/usr/include32', + ], + }], ], # -mmmx allows mmintrin.h to be used for mmx intrinsics. # video playback is mmx and sse2 optimized. |