From 2d8211ab30eb226c6117acf7d066c4e6c6140154 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Thu, 21 Jan 2016 23:19:32 -0600 Subject: gnu: american-fuzzy-lop: Fix qemu configure flags. Fixes regression introduced in 06da1a6. * gnu/packages/debug.scm (american-fuzzy-lop)[qemu]: Override inherited #:configure-flags. --- gnu/packages/debug.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index dc94f97657..3248922ba6 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015 Eric Bavier +;;; Copyright © 2014, 2015, 2016 Eric Bavier ;;; ;;; This file is part of GNU Guix. ;;; @@ -190,11 +190,13 @@ tools that process C/C++ code.") ;; afl only supports using a single afl-qemu-trace executable, so ;; we only build qemu for the native target. (arguments - `(#:configure-flags - (list (string-append "--target-list=" ,machine "-linux-user")) - #:modules ((srfi srfi-1) + `(#:modules ((srfi srfi-1) ,@%gnu-build-system-modules) ,@(substitute-keyword-arguments (package-arguments qemu-2.3.0) + ((#:configure-flags config-flags) + ``(,(string-append "--target-list=" ,machine "-linux-user") + ,@(remove (λ (f) (string-prefix? "--target-list=" f)) + ,config-flags))) ((#:phases qemu-phases) `(modify-phases ,qemu-phases (add-after -- cgit v1.2.3