diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-04 17:07:54 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-04 17:07:54 +0000 |
| commit | efd68462608db25d9b1700df18debba659bab64e (patch) | |
| tree | d97939d0bdfd78bc3713f559a0ea58306c3d66d4 /build | |
| parent | 4d83eb7d97c4b0f530eb82ad3cf6a1952d4183f4 (diff) | |
| download | chromium_src-efd68462608db25d9b1700df18debba659bab64e.zip chromium_src-efd68462608db25d9b1700df18debba659bab64e.tar.gz chromium_src-efd68462608db25d9b1700df18debba659bab64e.tar.bz2 | |
Detect python version using /usr/lib/libpython$(ver).so.1.0 instead of /usr/bin/python$(ver). /usr/bin/python may not be installed, i.e. on ARM buildbots.
BUG=none
TEST=ARM buildbots go green.
TBR=zelidrag
Review URL: http://codereview.chromium.org/669069
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40631 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 2 | ||||
| -rwxr-xr-x | build/linux/python_arch.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/build/common.gypi b/build/common.gypi index 5f3223c2..914746c 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -221,7 +221,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/bin/python<(python_ver))', + 'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)/usr/lib/libpython<(python_ver).so.1.0)', 'conditions': [ ['branding=="Chrome" or linux_chromium_breakpad==1', { 'linux_breakpad%': 1, diff --git a/build/linux/python_arch.sh b/build/linux/python_arch.sh index e3b0657..72d785d14 100755 --- a/build/linux/python_arch.sh +++ b/build/linux/python_arch.sh @@ -6,8 +6,8 @@ # This figures out the architecture of the version of Python we are building # pyautolib against. # -# python_arch.sh /usr/bin/python2.5 -# python_arch.sh /path/to/sysroot/usr/bin/python2.4 +# python_arch.sh /usr/lib/libpython2.5.so.1.0 +# python_arch.sh /path/to/sysroot/usr/lib/libpython2.4.so.1.0 # set -e |