From a5e0d18a99b79e2919e6242a0acf989eb82d932f Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Thu, 19 Jun 2014 14:46:46 +0100 Subject: [PATCH] make installers: give MSVC setup "x86_amd64" instead of "x64" by default The "x86_amd64" mode seems to work more often, especially with Visual Studio Express installations. original commit: 9c05eff8751cc104f430b8ed231268e79ecf5303 --- pkgs/distro-build-pkgs/distro-build-client/doc.txt | 4 ++-- pkgs/distro-build-pkgs/distro-build-server/drive-clients.rkt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/distro-build-pkgs/distro-build-client/doc.txt b/pkgs/distro-build-pkgs/distro-build-client/doc.txt index b969275..36fdcf1 100644 --- a/pkgs/distro-build-pkgs/distro-build-client/doc.txt +++ b/pkgs/distro-build-pkgs/distro-build-client/doc.txt @@ -216,8 +216,8 @@ Site-configuration keywords (where means no spaces, etc.): #:bits --- 32 or 64, affects Visual Studio mode #:vc --- provided to "vcvarsall/bat" to select the Visual - Studio build mode; the default is "x86" or "x64", depending on - `#:bits' + Studio build mode; the default is "x86" or "x86_amd64", depending + on `#:bits' #:sign-identity --- provides an identity to be passed to `codesign` for code signing on Mac OS X (for all executables in a diff --git a/pkgs/distro-build-pkgs/distro-build-server/drive-clients.rkt b/pkgs/distro-build-pkgs/distro-build-server/drive-clients.rkt index 8895a91..5a99b52 100644 --- a/pkgs/distro-build-pkgs/distro-build-server/drive-clients.rkt +++ b/pkgs/distro-build-pkgs/distro-build-server/drive-clients.rkt @@ -299,7 +299,7 @@ (define vc (or (get-opt c '#:vc) (if (= bits 32) "x86" - "x64"))) + "x86_amd64"))) (define j (or (get-opt c '#:j) 1)) (define (cmd . args) (list "cmd" "/c" (shell-protect (apply ~a args) platform)))