Bug 857526 - Check webrtc target arch right after checking target OS, instead of after AC_OUTPUT, which is too late. r=ted

This commit is contained in:
Mike Hommey 2013-04-08 08:34:06 +02:00
parent 0deb6d8a57
commit b90e93ff94

View File

@ -5274,6 +5274,31 @@ if test -n "$MOZ_WEBRTC"; then
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 ========================================================
@ -9064,31 +9089,6 @@ case "$host" in
;;
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