Paste number 352659: diff

Paste number 352659: diff
Pasted by: lfam
When:4 years, 3 months ago
Share:Tweet this! | http://paste.lisp.org/+7K43
Channel:None
Paste contents:
Raw Source | XML | Display As
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index bb8570bec..6a5a2617e 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -414,7 +414,8 @@ Go.  It also includes runtime support libraries for these languages.")
                (base32
                 "05xwps0ci7wgxh50askpa2r9p8518qxdgh6ad7pnyk7n6p13d0ca"))
               (patches (search-patches "gcc-strmov-store-file-names.patch"
-                                       "gcc-5.0-libvtv-runpath.patch"))))))
+                                       "gcc-5.0-libvtv-runpath.patch"
+                                       "gcc-7-go.patch"))))))
 
 ;; Note: When changing the default gcc version, update
 ;;       the gcc-toolchain-* definitions and the gfortran definition
@@ -562,6 +563,14 @@ as the 'native-search-paths' field."
               ;; a cyclic dependency.  <http://debbugs.gnu.org/18101>
               #:separate-lib-output? #f))
 
+(define-public gccgo-7
+  (custom-gcc gcc-7 "gccgo" '("go")
+              %generic-search-paths
+              ;; Suppress the separate "lib" output, because otherwise the
+              ;; "lib" and "out" outputs would refer to each other, creating
+              ;; a cyclic dependency.  <http://debbugs.gnu.org/18101>
+              #:separate-lib-output? #f))
+
 (define-public gcc-objc-4.8
   (custom-gcc gcc-4.8 "gcc-objc" '("objc")
               (list (search-path-specification
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 70cae6d87..0b5b92b40 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -219,7 +219,7 @@ sequential processes (CSP) concurrent programming features added.")
            (replace 'prebuild
              ;; TODO: Most of this could be factorized with Go 1.4.
              (lambda* (#:key inputs outputs #:allow-other-keys)
-               (let* ((gcclib (string-append (assoc-ref inputs "gcc:lib") "/lib"))
+               (let* ((gcclib (string-append (assoc-ref inputs "go") "/lib"))
                       (ld (string-append (assoc-ref inputs "libc") "/lib"))
                       (loader (car (find-files ld "^ld-linux.+")))
                       (net-base (assoc-ref inputs "net-base"))
@@ -363,7 +363,7 @@ sequential processes (CSP) concurrent programming features added.")
 
                  (copy-recursively "../" output))))))))
     (native-inputs
-     `(("go" ,go-1.4)
+     `(("go" ,gccgo-7)
        ,@(package-native-inputs go-1.4)))))
 
 (define-public go go-1.8)

This paste has no annotations.

Colorize as:
Show Line Numbers

Lisppaste pastes can be made by anyone at any time. Imagine a fearsomely comprehensive disclaimer of liability. Now fear, comprehensively.