diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-04 16:42:23 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-04 16:42:23 +0000 |
| commit | 4d83eb7d97c4b0f530eb82ad3cf6a1952d4183f4 (patch) | |
| tree | 49055561af0bdb31ac64379adcd50fe726a49900 /build/common.gypi | |
| parent | bbef41f026b0c7aecac8169e40020b892163fd08 (diff) | |
| download | chromium_src-4d83eb7d97c4b0f530eb82ad3cf6a1952d4183f4.zip chromium_src-4d83eb7d97c4b0f530eb82ad3cf6a1952d4183f4.tar.gz chromium_src-4d83eb7d97c4b0f530eb82ad3cf6a1952d4183f4.tar.bz2 | |
Build pyauto only if the architecture of python binary matches.
BUG=none
TEST=Building 32-bit pyauto on 64-bit Linux with a 32-bit sysroot works.
Review URL: http://codereview.chromium.org/660443
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40630 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/build/common.gypi b/build/common.gypi index 6c702ef..5f3223c2 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -91,6 +91,9 @@ # Set Neon compilation flags (only meaningful if armv7==1). 'arm_neon%': 1, + + # The system root for cross-compiles. Default: none. + 'sysroot%': '', }, # Define branding and buildtype on the basis of their settings within the @@ -107,6 +110,7 @@ 'python_ver%': '<(python_ver)', 'armv7%': '<(armv7)', 'arm_neon%': '<(arm_neon)', + 'sysroot%': '<(sysroot)', # The release channel that this build targets. This is used to restrict # channel-specific build options, like which installer packages to create. @@ -187,9 +191,6 @@ # but that doesn't work as we'd like. 'msvs_debug_link_incremental%': '2', - # The system root for cross-compiles. Default: none. - 'sysroot%': '', - # This is the location of the sandbox binary. Chrome looks for this before # running the zygote process. If found, and SUID, it will be used to # sandbox the zygote process and, thus, all renderer processes. @@ -219,6 +220,8 @@ # This will set gcc_version to XY if you are running gcc X.Y.*. # 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/bin/python<(python_ver))', 'conditions': [ ['branding=="Chrome" or linux_chromium_breakpad==1', { 'linux_breakpad%': 1, |