diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-04 17:20:29 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-04 17:20:29 +0000 |
| commit | 8f52aa62385d223e230e61fa15c629e0df936089 (patch) | |
| tree | 4d5c277d703ffc09e1cfed32a459c0ba5134ed3f /build | |
| parent | efd68462608db25d9b1700df18debba659bab64e (diff) | |
| download | chromium_src-8f52aa62385d223e230e61fa15c629e0df936089.zip chromium_src-8f52aa62385d223e230e61fa15c629e0df936089.tar.gz chromium_src-8f52aa62385d223e230e61fa15c629e0df936089.tar.bz2 | |
Ignore missing python library when detecting python architecture and just return unknown, which should disable building pyauto. The ARM buildbots have an incorrect python_ver set.
BUG=none
TEST=ARM buildbots go green.
TBR=zelidrag
Review URL: http://codereview.chromium.org/669071
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40632 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rwxr-xr-x | build/linux/python_arch.sh | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/build/linux/python_arch.sh b/build/linux/python_arch.sh index 72d785d14..d874051 100755 --- a/build/linux/python_arch.sh +++ b/build/linux/python_arch.sh @@ -10,12 +10,16 @@ # python_arch.sh /path/to/sysroot/usr/lib/libpython2.4.so.1.0 # -set -e - python=$(readlink -f "$1") +if [ -z "$python" ]; then + echo unknown + exit 0; +fi file_out=$(file "$python") - -set +e +if [ -z "$file_out" ]; then + echo unknown + exit 0; +fi echo $file_out | grep -qs "ARM" if [ $? -eq 0 ]; then |