Bug 857526 - Check webrtc target arch right after checking target OS, instead of after AC_OUTPUT, which is too late. r=ted
authorMike Hommey <mh+mozilla@glandium.org>
Mon, 08 Apr 2013 08:34:06 +0200
changeset 138907 8d1e8c802365cbdfbda2ded56f74a2e005cc33e1
parent 138906 06e05aaebe7bd7f94e3b86052bcdaf7c5c893ae4
child 138908 970623e7539343ed04c2249d047d56b139797452
push id2579
push userakeybl@mozilla.com
push dateMon, 24 Jun 2013 18:52:47 +0000
treeherdermozilla-beta@b69b7de8a05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs857526
milestone23.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 857526 - Check webrtc target arch right after checking target OS, instead of after AC_OUTPUT, which is too late. r=ted
configure.in
--- a/configure.in
+++ b/configure.in
@@ -5269,16 +5269,41 @@ if test -n "$MOZ_WEBRTC"; then
         ;;
     *)
         dnl default to disabled for all others
         MOZ_WEBRTC=
         ;;
     esac
 fi
 
+# target_arch is from {ia32|x64|arm|ppc}
+case "$CPU_ARCH" in
+x86_64 | ia64)
+    WEBRTC_TARGET_ARCH=x64
+    ;;
+
+arm*)
+    WEBRTC_TARGET_ARCH=arm
+    ;;
+
+x86)
+    WEBRTC_TARGET_ARCH=ia32
+    ;;
+
+ppc*)
+    WEBRTC_TARGET_ARCH=ppc
+    ;;
+*)
+# unsupported arch for webrtc
+    WEBRTC_TARGET_ARCH=unknown
+    MOZ_WEBRTC=
+    ;;
+
+esac
+
 dnl ========================================================
 dnl = Disable WebRTC code
 dnl ========================================================
 MOZ_ARG_DISABLE_BOOL(webrtc,
 [  --disable-webrtc        Disable support for WebRTC],
     MOZ_WEBRTC=,
     MOZ_WEBRTC=1)
 
@@ -9059,41 +9084,16 @@ case "$host" in
 *-apple-darwin11*)
     FIXED_EGREP="env ARCHPREFERENCE=i386,x86_64 arch egrep"
     ;;
 *)
     FIXED_EGREP="egrep"
     ;;
 esac
 
-# target_arch is from {ia32|x64|arm|ppc}
-case "$CPU_ARCH" in
-x86_64 | ia64)
-    WEBRTC_TARGET_ARCH=x64
-    ;;
-
-arm*)
-    WEBRTC_TARGET_ARCH=arm
-    ;;
-
-x86)
-    WEBRTC_TARGET_ARCH=ia32
-    ;;
-
-ppc*)
-    WEBRTC_TARGET_ARCH=ppc
-    ;;
-*)
-# unsupported arch for webrtc
-    WEBRTC_TARGET_ARCH=unknown
-    MOZ_WEBRTC=
-    ;;
-
-esac
-
 # Generate Makefiles for WebRTC directly from .gyp files
 if test "${OS_TARGET}" = "WINNT"; then
    if test "$HAVE_64BIT_OS"; then
       OS_BITS=64
    else
       OS_BITS=32
    fi
    EXTRA_GYP_DEFINES="-D MSVS_VERSION=${_MSVS_VERSION} -D MSVS_OS_BITS=${OS_BITS}"