Bug 1390253 - Increase RAM threshold for automatic 64-bit installation. r=rstrong

MozReview-Commit-ID: 1IDedw68lF6

--HG--
extra : rebase_source : 87cb547e5989410d4fe6df3c13f2ce427acbd70a
This commit is contained in:
Matt Howell 2017-08-14 13:14:01 -07:00
Родитель 9a79323f32
Коммит 0fcb607c97
1 изменённых файлов: 4 добавлений и 8 удалений

Просмотреть файл

@ -186,13 +186,9 @@ Var ProfileCleanupButtonString
!define BlurbDisplayMS 19500
!define BlurbBlankMS 500
; Amount of physical memory required for the 64-bit build to be selected.
; Machines with less RAM than this get the 32-bit build, even with a 64-bit OS.
; The value 1800 MB was chosen based on an initial requirement of 2 GB, reduced
; to allow for hardware such as integrated graphics that reserves some of the
; installed RAM for its own use.
; 1800 MB * 1024 KB/MB * 1024 B/KB = 1887436800 bytes
!define RAM_NEEDED_FOR_64BIT 1887436800
; Amount of physical memory required for the 64-bit build to be selected (2 GB).
; Machines with this or less RAM get the 32-bit build, even with a 64-bit OS.
!define RAM_NEEDED_FOR_64BIT 0x80000000
; Attempt to elevate Standard Users in addition to users that
; are a member of the Administrators group.
@ -333,7 +329,7 @@ Function .onInit
System::Free $0
${If} ${RunningX64}
${AndIf} $1 L>= ${RAM_NEEDED_FOR_64BIT}
${AndIf} $1 L> ${RAM_NEEDED_FOR_64BIT}
StrCpy $DroplistArch "$(VERSION_64BIT)"
StrCpy $INSTDIR "${DefaultInstDir64bit}"
${Else}