diff options
| author | wangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-24 22:43:23 +0000 |
|---|---|---|
| committer | wangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-24 22:43:23 +0000 |
| commit | 4aef1770f2cb1e2bb208c96538538ec98abe0540 (patch) | |
| tree | c54d0dfaf0274b311496d833d87bb5964776c6ee /build | |
| parent | 56ab196284872884378c273e96b01cf3902d18c2 (diff) | |
| download | chromium_src-4aef1770f2cb1e2bb208c96538538ec98abe0540.zip chromium_src-4aef1770f2cb1e2bb208c96538538ec98abe0540.tar.gz chromium_src-4aef1770f2cb1e2bb208c96538538ec98abe0540.tar.bz2 | |
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: svn://svn.chromium.org/chrome/trunk/src@138916 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rwxr-xr-x | build/android/envsetup.sh | 6 | ||||
| -rw-r--r-- | build/common.gypi | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/build/android/envsetup.sh b/build/android/envsetup.sh index 6ed168d..7ddd064 100755 --- a/build/android/envsetup.sh +++ b/build/android/envsetup.sh @@ -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) \ diff --git a/build/common.gypi b/build/common.gypi index a0e9ab3..b5149a5 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -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++)'], |