diff options
| author | vapier@google.com <vapier@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-30 04:38:43 +0000 |
|---|---|---|
| committer | vapier@google.com <vapier@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-30 04:38:43 +0000 |
| commit | 945361ae3043e3661026bc97167778e91486cf48 (patch) | |
| tree | 38fc7bc0dbd17f3911acca09386647484e18d7fd /build | |
| parent | 679736cb9c54a922fe6f217adf420183d81f960f (diff) | |
| download | chromium_src-945361ae3043e3661026bc97167778e91486cf48.zip chromium_src-945361ae3043e3661026bc97167778e91486cf48.tar.gz chromium_src-945361ae3043e3661026bc97167778e91486cf48.tar.bz2 | |
linux: allow builds to override libdir path
Not all multilibs install into /usr/lib/, so when building for one which
doesn't, we hit errors where the detected python arch does not match the
detected target arch. Like x86_64/powerpc64/sparc64/etc... which use
/usr/lib64/.
Review URL: http://codereview.chromium.org/8018002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103422 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi index 26868ae..94afd8c 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -145,6 +145,9 @@ # The system root for cross-compiles. Default: none. 'sysroot%': '', + # The system libdir used for this ABI. + 'system_libdir%': 'lib', + # On Linux, we build with sse2 for Chromium builds. 'disable_sse2%': 0, @@ -337,6 +340,7 @@ 'armv7%': '<(armv7)', 'arm_neon%': '<(arm_neon)', 'sysroot%': '<(sysroot)', + 'system_libdir%': '<(system_libdir)', 'disable_sse2%': '<(disable_sse2)', 'component%': '<(component)', 'use_titlecase_in_grd_files%': '<(use_titlecase_in_grd_files)', @@ -571,7 +575,7 @@ # This is used to tweak build flags for gcc 4.4. 'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)', # Figure out the python architecture to decide if we build pyauto. - 'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)/usr/lib/libpython<(python_ver).so.1.0)', + 'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)/usr/<(system_libdir)/libpython<(python_ver).so.1.0)', 'conditions': [ ['branding=="Chrome"', { 'linux_breakpad%': 1, |