diff options
| author | Mark H Weaver <mhw@netris.org> | 2017-06-26 00:00:58 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2017-06-26 00:00:58 -0400 |
| commit | ed068b960eeedb92823238783779730319b8ba0e (patch) | |
| tree | 36a4de280458d52520b911b2716eb5cea309fd78 /gnu/packages/embedded.scm | |
| parent | a9308efec642bfbce480545a22fce848e6212456 (diff) | |
| parent | ffc015bea26f24d862e7e877d907fbe1ab9a9967 (diff) | |
| download | patches-ed068b960eeedb92823238783779730319b8ba0e.tar patches-ed068b960eeedb92823238783779730319b8ba0e.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/embedded.scm')
| -rw-r--r-- | gnu/packages/embedded.scm | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index e0e1793db1..29a3e543e5 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 |