01/01: gnu: propeller-gcc: Default to version 4.

[Ricardo Wurmus]

rekado pushed a commit to branch master
in repository guix.

commit bb19b2ebf3a6661e1c8eb22c70bc7759fe20e0db
Author: Ricardo Wurmus <address@hidden>
Date:   Wed Jun 21 22:45:40 2017 +0200

    gnu: propeller-gcc: Default to version 4.
    
    * gnu/packages/embedded.scm (propeller-gcc): Rename this...
    (propeller-gcc-6): ...to this.
    (propeller-gcc-4): Inherit from propeller-gcc-6.
    (propeller-gcc): New alias for propeller-gcc-4.
---
 gnu/packages/embedded.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm
index a11722a..e509647 100644
--- a/gnu/packages/embedded.scm
+++ b/gnu/packages/embedded.scm
@@ -452,7 +452,7 @@ with a layered architecture of JTAG interface and TAP 
support.")
          ("dejagnu" ,dejagnu)
          ,@(package-native-inputs xbinutils))))))
 
-(define-public propeller-gcc
+(define-public propeller-gcc-6
   (let ((xgcc (cross-gcc "propeller-elf"
                          #:xbinutils propeller-binutils))
         (commit "b4f45a4725e0b6d0af59e594c4e3e35ca4105867")
@@ -489,7 +489,7 @@ with a layered architecture of JTAG interface and TAP 
support.")
       (synopsis "GCC for the Parallax Propeller"))))
 
 (define-public propeller-gcc-4
-  (let ((xgcc propeller-gcc)
+  (let ((xgcc propeller-gcc-6)
         (commit "f1b01001b760d691a91ff1db4830d41bb712557f")
         (revision "1"))
     (package (inherit xgcc)
@@ -511,6 +511,11 @@ with a layered architecture of JTAG interface and TAP 
support.")
                                   "gcc-cross-environment-variables.patch")))))
       (home-page "https://github.com/dbetz/propgcc-gcc";))))
 
+;; Version 6 is experimental and may not work correctly.  This is why we
+;; default to version 4, which is also used in the binary toolchain bundle
+;; provided by Parallax Inc.
+(define-public propeller-gcc propeller-gcc-4)
+
 ;; There is no release, so we take the latest version as referenced from here:
 ;; https://github.com/dbetz/propeller-gcc
 (define-public proplib