diff options
| author | John Ericson <git@JohnEricson.me> | 2019-03-29 16:11:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-29 16:11:22 -0400 |
| commit | 842b14ba98e037ff954eefe7f2bb60b7707735e9 (patch) | |
| tree | 6c8ef00653e664843c343b6b02d1df3e48be0311 /pkgs/top-level | |
| parent | b46e9ad84b96ffce579ae5132f311b28b6d78506 (diff) | |
| parent | c17cf32a3724bf6c23cb3146acb639c414c8edd8 (diff) | |
| download | nixpkgs-842b14ba98e037ff954eefe7f2bb60b7707735e9.tar nixpkgs-842b14ba98e037ff954eefe7f2bb60b7707735e9.tar.gz nixpkgs-842b14ba98e037ff954eefe7f2bb60b7707735e9.tar.bz2 nixpkgs-842b14ba98e037ff954eefe7f2bb60b7707735e9.tar.lz nixpkgs-842b14ba98e037ff954eefe7f2bb60b7707735e9.tar.xz nixpkgs-842b14ba98e037ff954eefe7f2bb60b7707735e9.tar.zst nixpkgs-842b14ba98e037ff954eefe7f2bb60b7707735e9.zip | |
Merge pull request #58330 from AerialX/msp430
TI MSP430 cross compiling
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 11 | ||||
| -rw-r--r-- | pkgs/top-level/release-cross.nix | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8c3459e987..08b3df6f382 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8373,6 +8373,16 @@ in binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; }; + msp430GccSupport = callPackage ../development/misc/msp430/gcc-support.nix { }; + + msp430Newlib = callPackage ../development/misc/msp430/newlib.nix { }; + msp430NewlibCross = callPackage ../development/misc/msp430/newlib.nix { + inherit (buildPackages.xorg) lndir; + newlib = newlibCross; + }; + + mspdebug = callPackage ../development/misc/msp430/mspdebug.nix { }; + pharo-vms = callPackage ../development/pharo/vm { }; pharo = pharo-vms.multi-vm-wrapper; pharo-cog32 = pharo-vms.cog32; @@ -10141,6 +10151,7 @@ in else if name == "bionic" then targetPackages.bionic or bionic else if name == "uclibc" then targetPackages.uclibcCross or uclibcCross else if name == "avrlibc" then targetPackages.avrlibcCross or avrlibcCross + else if name == "newlib" && stdenv.targetPlatform.isMsp430 then targetPackages.msp430NewlibCross or msp430NewlibCross else if name == "newlib" then targetPackages.newlibCross or newlibCross else if name == "musl" then targetPackages.muslCross or muslCross else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64 diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index b06bb5393be..f4210fcfc72 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -140,6 +140,7 @@ in android64 = mapTestOnCross lib.systems.examples.aarch64-android-prebuilt (linuxCommon // { }); + msp430 = mapTestOnCross lib.systems.examples.msp430 embedded; avr = mapTestOnCross lib.systems.examples.avr embedded; arm-embedded = mapTestOnCross lib.systems.examples.arm-embedded embedded; powerpc-embedded = mapTestOnCross lib.systems.examples.ppc-embedded embedded; |