Bug 857526 - Check webrtc target arch right after checking target OS, instead of after AC_OUTPUT, which is too late. r=ted, a=akeybl
authorMike Hommey <mh+mozilla@glandium.org>
Mon, 08 Apr 2013 08:34:06 +0200
changeset 132590 f830a7473078ceb65ca590b0b3510ef7a1353ecb
parent 132589 e9116e0abdd6f2090f9fde7061cd38cb47141bf1
child 132591 a1c5f1c5fb1d0f084ad0f512ab2e840addbd5b13
push id2361
push userryanvm@gmail.com
push dateThu, 11 Apr 2013 12:35:50 +0000
treeherdermozilla-beta@f830a7473078 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted, akeybl
bugs857526
milestone21.0
Bug 857526 - Check webrtc target arch right after checking target OS, instead of after AC_OUTPUT, which is too late. r=ted, a=akeybl
configure.in
--- a/configure.in
+++ b/configure.in
@@ -5217,16 +5217,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)
 
@@ -8933,38 +8958,16 @@ dnl Load the list of Makefiles to genera
 dnl   To add new Makefiles, edit allmakefiles.sh.
 dnl   allmakefiles.sh sets the variable, MAKEFILES.
 . ${srcdir}/allmakefiles.sh
 
 echo $MAKEFILES > unallmakefiles
 
 AC_OUTPUT($MAKEFILES)
 
-# target_arch is from {ia32|x64|arm}
-case "$CPU_ARCH" in
-x86_64 | ia64)
-    WEBRTC_TARGET_ARCH=x64
-    ;;
-
-arm*)
-    WEBRTC_TARGET_ARCH=arm
-    ;;
-
-x86)
-    WEBRTC_TARGET_ARCH=ia32
-    ;;
-
-*)
-# 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}"