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: http://src.chromium.org/svn/trunk/src/build@103422 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
vapier@google.com 2011-09-30 04:38:43 +00:00
Родитель c0f11f7c0e
Коммит 51fc68dbba
1 изменённых файлов: 5 добавлений и 1 удалений

Просмотреть файл

@ -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,