guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/02: gnu: american-fuzzy-lop: Fix qemu configure flags.


From: Eric Bavier
Subject: 01/02: gnu: american-fuzzy-lop: Fix qemu configure flags.
Date: Fri, 22 Jan 2016 05:55:16 +0000

bavier pushed a commit to branch master
in repository guix.

commit 2d8211ab30eb226c6117acf7d066c4e6c6140154
Author: Eric Bavier <address@hidden>
Date:   Thu Jan 21 23:19:32 2016 -0600

    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 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm
index dc94f97..3248922 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 <address@hidden>
+;;; Copyright © 2014, 2015, 2016 Eric Bavier <address@hidden>
 ;;;
 ;;; 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]