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: http://src.chromium.org/svn/trunk/src/build@232181 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
mark@chromium.org 2013-10-31 18:40:00 +00:00
Родитель 304faa92d0
Коммит 0b1f2af283
2 изменённых файлов: 6 добавлений и 2 удалений

Просмотреть файл

@ -4648,6 +4648,11 @@
'x86_64'
],
}],
['target_arch=="ia32"', {
'ARCHS': [
'i386'
],
}],
],
# The Xcode generator will look for an xcode_settings section at the root

Просмотреть файл

@ -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