revert confvars.sh changes
authorRobert Strong <robert.bugzilla@gmail.com>
Thu, 16 Jul 2015 15:22:22 -0700
changeset 491454 2d12058dd5f321d415a25484002ad00adfe8920b
parent 491453 7abc2258d597ffaa58da29dfb561a48609fb4871
child 491455 778ef4b5e5e2b827c472e18a4260b27150d377b6
push id47343
push userbmo:dothayer@mozilla.com
push dateWed, 01 Mar 2017 22:58:58 +0000
milestone42.0a1
revert confvars.sh changes
browser/confvars.sh
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -5,31 +5,28 @@
 
 MOZ_APP_BASENAME=Firefox
 MOZ_APP_VENDOR=Mozilla
 MOZ_UPDATER=1
 MOZ_PHOENIX=1
 
 if test "$OS_ARCH" = "WINNT"; then
   MOZ_MAINTENANCE_SERVICE=1
+  MOZ_VERIFY_MAR_SIGNATURE=1
   if ! test "$HAVE_64BIT_BUILD"; then
     if test "$MOZ_UPDATE_CHANNEL" = "nightly" -o \
             "$MOZ_UPDATE_CHANNEL" = "aurora" -o \
             "$MOZ_UPDATE_CHANNEL" = "beta" -o \
             "$MOZ_UPDATE_CHANNEL" = "release"; then
       if ! test "$MOZ_DEBUG"; then
         MOZ_STUB_INSTALLER=1
       fi
     fi
   fi
-fi
-
-if test "$OS_ARCH" = "WINNT" -o \
-        "$OS_ARCH" = "Darwin" -o \
-        "$OS_ARCH" = "Linux"; then
+elif test "$OS_ARCH" = "Darwin"; then
   MOZ_VERIFY_MAR_SIGNATURE=1
 fi
 
 # Enable building ./signmar and running libmar signature tests
 MOZ_ENABLE_SIGNMAR=1
 
 MOZ_CHROME_FILE_FORMAT=omni
 MOZ_DISABLE_EXPORT_JS=1