guix-commits
[Top][All Lists]
Advanced

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

01/02: gnu: hyperrogue: Fix FTBFS with GCC7.


From: Marius Bakke
Subject: 01/02: gnu: hyperrogue: Fix FTBFS with GCC7.
Date: Sun, 7 Oct 2018 14:12:55 -0400 (EDT)

mbakke pushed a commit to branch wip-gcc7
in repository guix.

commit f8c3d921b9c2e86f3caaadcf9204849d9cd628be
Author: Marius Bakke <address@hidden>
Date:   Sun Oct 7 18:31:26 2018 +0200

    gnu: hyperrogue: Fix FTBFS with GCC7.
    
    * gnu/packages/games.scm (hyperrogue)[arguments]: Remove redundant
      #:make-flags.  Preserve original CPATH when adding SDL path.
---
 gnu/packages/games.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 8be87f6..e56945a 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -3548,13 +3548,13 @@ throwing people around in pseudo-randomly generated 
buildings.")
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f ; no check target
-       #:make-flags '("CXXFLAGS=-std=c++11")
        #:phases
        (modify-phases %standard-phases
          (add-after 'set-paths 'set-sdl-paths
            (lambda* (#:key inputs #:allow-other-keys)
              (setenv "CPATH"
-                     (string-append (assoc-ref inputs "sdl-union")
+                     (string-append (getenv "CPATH") ":"
+                                    (assoc-ref inputs "sdl-union")
                                     "/include/SDL"))))
          (replace 'configure
            (lambda* (#:key inputs outputs #:allow-other-keys)



reply via email to

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