From 49691c400077001ba2746963e9108e367884aeb2 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Fri, 13 Jun 2014 16:05:20 +0100 Subject: [PATCH] fix glib build for Windows 64 The previous build attempted to cooperate with Valgrind in a way that truncates a 64-bit address to a 32-bit address. Disable Valgrind cooperation. (Other builds seem ok for now, but future rebuilds will disable Valgrind cooperation for them, too.) --- native-pkgs | 2 +- racket/src/native-libs/build.rkt | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/native-pkgs b/native-pkgs index 8988164a6e..a4521921ce 160000 --- a/native-pkgs +++ b/native-pkgs @@ -1 +1 @@ -Subproject commit 8988164a6e18abb1b796add19a6941021f61db56 +Subproject commit a4521921cea66170c4b55373cda6191fb47730d5 diff --git a/racket/src/native-libs/build.rkt b/racket/src/native-libs/build.rkt index 20b1d590b8..7a29aef1ac 100644 --- a/racket/src/native-libs/build.rkt +++ b/racket/src/native-libs/build.rkt @@ -296,7 +296,10 @@ (if win? '("libiconv") '())) - #:env path-flags + #:env (append path-flags + ;; Disable Valgrind support, which particularly + ;; goes wrong for 64-bit Windows builds. + (list (list "CPPFLAGS" "-DNVALGRIND=1"))) #:patches (if (and win? m32?) (list rand-patch) null))]