diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-31 18:40:00 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-31 18:40:00 +0000 |
| commit | d6455401046a035f9e5fe2cd1541466cf169517a (patch) | |
| tree | 2e50285a22fe2bbbb4d75668d5cfdeda99e16ffc /build/mac | |
| parent | 57ad24d8523fa9ca9e8f47882357006d70a59f4b (diff) | |
| download | chromium_src-d6455401046a035f9e5fe2cd1541466cf169517a.zip chromium_src-d6455401046a035f9e5fe2cd1541466cf169517a.tar.gz chromium_src-d6455401046a035f9e5fe2cd1541466cf169517a.tar.bz2 | |
Fix build for xcodebuild from Xcode 5:
- In Xcode 5, ARCHS defaults to x86_64 instead of i386. Use i386 for the
32-bit Chrome build.
- In Xcode 5, otool is no longer available in DEVELOPER_BIN_DIR. Run otool
via xcrun as in r227787.
BUG=280362
R=thakis@chromium.org
Review URL: https://codereview.chromium.org/47753003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232181 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/mac')
| -rwxr-xr-x | build/mac/verify_no_objc.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/build/mac/verify_no_objc.sh b/build/mac/verify_no_objc.sh index 955f9be..e18a5ea 100755 --- a/build/mac/verify_no_objc.sh +++ b/build/mac/verify_no_objc.sh @@ -26,10 +26,9 @@ set -eu -otool="${DEVELOPER_BIN_DIR:-/usr/bin}/otool" executable="${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}" -if "${otool}" -arch i386 -o "${executable}" | grep -q '^Contents.*section$'; \ +if xcrun otool -arch i386 -o "${executable}" | grep -q '^Contents.*section$'; \ then echo "${0}: ${executable} has an __OBJC,__image_info section" 2>&1 exit 1 |