Fix break building v8 with goma

The error is caused by missing '-m32' parameter when building v8 for host.
  CXX(host) out/Release/obj.host/v8_base/v8/src/accessors.o
v8/src/globals.h:120:2: error: #error Target architecture arm is only supported on arm and ia32 host

v8/build/common.gypi tests if the compiler supports -m32:
  'm32flag': '<!((echo | $(echo ${CXX_host:-$(which g++)}) -m32 -E - > /dev/null 2>&1) && echo -n "-m32" || true)',
but goma is confused by the environment variable GOMA_WRAPPER and exits
with an error:
  GOMA_WRAPPER=<anything>: unkown GOMA_ parameter
and the gyp script thinks that the compiler doesn't support -m32.

Rename GOMA_WRAPPER to ANDROID_GOMA_WRAPPER to avoid confusing goma.

git-svn-id: http://src.chromium.org/svn/trunk/src/build@138916 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
wangxianzhu@chromium.org 2012-05-24 22:43:23 +00:00
Родитель d932cea117
Коммит 1b837b7e7d
2 изменённых файлов: 6 добавлений и 6 удалений

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

@ -107,12 +107,12 @@ export PATH=$PATH:${CHROME_SRC}/build/android
# Performs a gyp_chromium run to convert gyp->Makefile for android code.
android_gyp() {
GOMA_WRAPPER=""
ANDROID_GOMA_WRAPPER=""
if [[ -d $GOMA_DIR ]]; then
GOMA_WRAPPER="$GOMA_DIR/gomacc"
ANDROID_GOMA_WRAPPER="$GOMA_DIR/gomacc"
fi
# Ninja requires "*_target" for target builds.
GOMA_WRAPPER=${GOMA_WRAPPER} \
ANDROID_GOMA_WRAPPER=${ANDROID_GOMA_WRAPPER} \
CC_target=$(basename ${ANDROID_TOOLCHAIN}/*-gcc) \
CXX_target=$(basename ${ANDROID_TOOLCHAIN}/*-g++) \
LINK_target=$(basename ${ANDROID_TOOLCHAIN}/*-gcc) \

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

@ -3090,9 +3090,9 @@
# Hardcode the compiler names in the Makefile so that
# it won't depend on the environment at make time.
'make_global_settings': [
['CC', '<!(/bin/echo -n ${GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/*-gcc)'],
['CXX', '<!(/bin/echo -n ${GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/*-g++)'],
['LINK', '<!(/bin/echo -n ${GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/*-gcc)'],
['CC', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/*-gcc)'],
['CXX', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/*-g++)'],
['LINK', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/*-gcc)'],
['CC.host', '<!(which gcc)'],
['CXX.host', '<!(which g++)'],
['LINK.host', '<!(which g++)'],