Bug 845711 - Fix EXTRA_GYP_DEFINES for arm on non-bash shells. r=ted
authorSteven Lee <slee@mozilla.com>
Wed, 27 Feb 2013 15:44:34 +0100
changeset 123157 ddd9cd9685bf2cc2a52195a510b8567856d35cda
parent 123156 41458ff35cedd4cec9dd0f7ce11fa0eb48a90cae
child 123158 055d662405a53cfab51143f69356c22fdf2c6a32
push id24373
push userryanvm@gmail.com
push dateThu, 28 Feb 2013 01:36:21 +0000
treeherdermozilla-central@8cb9d6981978 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs845711
milestone22.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 845711 - Fix EXTRA_GYP_DEFINES for arm on non-bash shells. r=ted
configure.in
--- a/configure.in
+++ b/configure.in
@@ -9024,19 +9024,19 @@ if test "${OS_TARGET}" = "WINNT"; then
    else
       OS_BITS=32
    fi
    EXTRA_GYP_DEFINES="-D MSVS_VERSION=${_MSVS_VERSION} -D MSVS_OS_BITS=${OS_BITS}"
 
 elif test "${OS_TARGET}" = "Android"; then
    EXTRA_GYP_DEFINES="-D gtest_target_type=executable -D android_toolchain=${android_toolchain} -G os=android "
    if test -n "$ARM_ARCH" && test "$ARM_ARCH" -lt 7; then
-      EXTRA_GYP_DEFINES+=" -D armv7=0 "
+      EXTRA_GYP_DEFINES="${EXTRA_GYP_DEFINES} -D armv7=0 "
    else
-      EXTRA_GYP_DEFINES+=" -D armv7=1 "
+      EXTRA_GYP_DEFINES="${EXTRA_GYP_DEFINES} -D armv7=1 "
    fi
 fi
 
 # Don't try to compile sse4.1 code if toolchain doesn't support
 if test -z "$HAVE_TOOLCHAIN_SUPPORT_MSSE4_1"; then
   EXTRA_GYP_DEFINES="$EXTRA_GYP_DEFINES -D yuv_disable_asm=1"
 fi