--- a/mail/confvars.sh
+++ b/mail/confvars.sh
@@ -18,17 +18,19 @@ if test "$OS_ARCH" = "WINNT"; then
   if ! test "$HAVE_64BIT_OS"; then
     MOZ_VERIFY_MAR_SIGNATURE=1
     MOZ_MAINTENANCE_SERVICE=1
   fi
 fi
 
 # Disable WebRTC as we don't use it currently and to work around bug 837618
 # for Mac
+if test "$OS_ARCH" == "Darwin"; then
 MOZ_WEBRTC=
+fi
 
 MOZ_SAFE_BROWSING=1
 MOZ_MORK=1
 if test -z "$MOZ_INCOMPLETE_EXTERNAL_LINKAGE"; then
 MOZ_APP_COMPONENT_LIBS="xpautocomplete mailcomps $MAIL_COMPONENT $LDAP_COMPONENT $MORK_COMPONENT"
 MOZ_APP_COMPONENT_MODULES="MODULE(xpAutoComplete) MODULE(nsMailCompsModule) $MAIL_MODULE $LDAP_MODULE $MORK_MODULE"
 MOZ_APP_EXTRA_LIBS="$LDAP_LIBS"
 fi

--- a/suite/confvars.sh
+++ b/suite/confvars.sh
@@ -33,17 +33,19 @@ MOZ_APP_COMPONENT_MODULES="MODULE(xpAuto
 MOZ_APP_EXTRA_LIBS="$LDAP_LIBS"
 fi
 MOZ_SERVICES_COMMON=1
 MOZ_SERVICES_CRYPTO=1
 MOZ_SERVICES_SYNC=1
 MOZ_URL_CLASSIFIER=1
 # Disable WebRTC as we don't use it currently and to work around bug 837618
 # for Mac
+if test "$OS_ARCH" == "Darwin"; then
 MOZ_WEBRTC=
+fi
 
 MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt
 MOZ_APP_VERSION=`cat $MOZ_APP_VERSION_TXT`
 SEAMONKEY_VERSION=$MOZ_APP_VERSION
 
 MOZ_UA_BUILDID=20100101
 
 MOZ_APP_ID={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}