OLD | NEW |
1 #!/bin/sh | 1 #!/bin/sh |
2 | 2 |
3 # Copyright (c) 2009-2010 The Chromium Authors. All rights reserved. | 3 # Copyright (c) 2009-2010 The Chromium Authors. All rights reserved. |
4 # Use of this source code is governed by a BSD-style license that can be | 4 # Use of this source code is governed by a BSD-style license that can be |
5 # found in the LICENSE file. | 5 # found in the LICENSE file. |
6 | 6 |
7 # This script contains some functions useful to build | 7 # This script contains some functions useful to build |
8 # Valgrind and ThreadSanitizer for use with chromium | 8 # Valgrind and ThreadSanitizer for use with chromium |
9 | 9 |
10 THISDIR=$(dirname "${0}") | 10 THISDIR=$(dirname "${0}") |
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
168 else | 168 else |
169 echo "You have Darwin kernel different from 9.X.X--11.X.X" >&2 | 169 echo "You have Darwin kernel different from 9.X.X--11.X.X" >&2 |
170 echo "Please, don't put the resulting binaries into Chromium SVN" >&2 | 170 echo "Please, don't put the resulting binaries into Chromium SVN" >&2 |
171 build_valgrind "local" | 171 build_valgrind "local" |
172 fi | 172 fi |
173 ;; | 173 ;; |
174 "Darwin x86_64") | 174 "Darwin x86_64") |
175 if system_is_lion | 175 if system_is_lion |
176 then | 176 then |
177 build_valgrind "mac_10.7" | 177 build_valgrind "mac_10.7" |
| 178 elif system_is_snow_leopard |
| 179 then |
| 180 build_valgrind "mac_10.6" "--build=amd64-darwin" |
178 else | 181 else |
179 echo "You have Darwin kernel different from 11.X.X" >&2 | 182 echo "You have Darwin kernel different from 11.X.X" >&2 |
180 echo "Please, don't put the resulting binaries into Chromium SVN" >&2 | 183 echo "Please, don't put the resulting binaries into Chromium SVN" >&2 |
181 build_valgrind "local" | 184 build_valgrind "local" |
182 fi | 185 fi |
183 ;; | 186 ;; |
184 *) | 187 *) |
185 build_valgrind "local" | 188 build_valgrind "local" |
186 ;; | 189 ;; |
187 esac | 190 esac |
188 } | 191 } |
189 | 192 |
190 # Check that the binaries directory exists. | 193 # Check that the binaries directory exists. |
191 BINARIES_DIR="$THISDIR/../binaries" | 194 BINARIES_DIR="$THISDIR/../binaries" |
192 if ! [ -a "$BINARIES_DIR" ] | 195 if ! [ -a "$BINARIES_DIR" ] |
193 then | 196 then |
194 echo "Error: $BINARIES_DIR doesn't exist!" >&2 | 197 echo "Error: $BINARIES_DIR doesn't exist!" >&2 |
195 exit 1 | 198 exit 1 |
196 fi | 199 fi |
197 | 200 |
198 set -e | 201 set -e |
199 set -x | 202 set -x |
OLD | NEW |