From 8482c13edcb8a981c393ff7b21be460209608458 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 2 Apr 2009 07:55:47 +0000
Subject: [PATCH] * Hopefully really fix memtest86.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14829
---
 pkgs/tools/misc/memtest86/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/memtest86/default.nix b/pkgs/tools/misc/memtest86/default.nix
index c671afbbdf4a..57bc769d2404 100644
--- a/pkgs/tools/misc/memtest86/default.nix
+++ b/pkgs/tools/misc/memtest86/default.nix
@@ -16,8 +16,11 @@ stdenv.mkDerivation {
         touch gnu/stubs-32.h
     fi
   '';
-  
-  NIX_CFLAGS_COMPILE = "-I.";
+
+  # Override the default optimisation setting (`-Os') to prevent lots
+  # of spurious errors.  See
+  # https://bugs.launchpad.net/fedora/+source/memtest86+/+bug/246412.
+  NIX_CFLAGS_COMPILE = "-O1 -I.";
   
   installPhase = ''
     ensureDir $out