diff options
author | Michael Bishop <cleverca22@gmail.com> | 2019-11-02 12:47:38 -0300 |
---|---|---|
committer | Michael Bishop <cleverca22@gmail.com> | 2019-11-19 22:19:15 -0400 |
commit | 4aa1ffae041bb9c65eb3067e9dbaaa70710ed100 (patch) | |
tree | 7c1d8395796e35e95e89e4e522dd036c9ba48608 /pkgs/top-level | |
parent | 91b02cd86b09bdd3549663e81883a2c3a7e11961 (diff) | |
download | nixpkgs-4aa1ffae041bb9c65eb3067e9dbaaa70710ed100.tar nixpkgs-4aa1ffae041bb9c65eb3067e9dbaaa70710ed100.tar.gz nixpkgs-4aa1ffae041bb9c65eb3067e9dbaaa70710ed100.tar.bz2 nixpkgs-4aa1ffae041bb9c65eb3067e9dbaaa70710ed100.tar.lz nixpkgs-4aa1ffae041bb9c65eb3067e9dbaaa70710ed100.tar.xz nixpkgs-4aa1ffae041bb9c65eb3067e9dbaaa70710ed100.tar.zst nixpkgs-4aa1ffae041bb9c65eb3067e9dbaaa70710ed100.zip |
initial implementation of vc4 cross-compile
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 06a01805ceb..757ba2ad525 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7765,8 +7765,8 @@ in gerbil = callPackage ../development/compilers/gerbil { stdenv = gccStdenv; }; gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { stdenv = gccStdenv; }; - gccFun = callPackage ../development/compilers/gcc/8; - gcc = gcc8; + gccFun = callPackage (if stdenv.targetPlatform.isVc4 then ../development/compilers/gcc/6 else ../development/compilers/gcc/8); + gcc = if stdenv.targetPlatform.isVc4 then gcc6 else gcc8; gcc-unwrapped = gcc.cc; gccStdenv = if stdenv.cc.isGNU then stdenv else stdenv.override { @@ -9390,6 +9390,9 @@ in mspdebug = callPackage ../development/misc/msp430/mspdebug.nix { }; + vc4-newlib = callPackage ../development/misc/vc4/newlib.nix {}; + resim = callPackage ../misc/emulators/resim {}; + rappel = callPackage ../development/misc/rappel/default.nix { }; pharo-vms = callPackage ../development/pharo/vm { }; @@ -11336,6 +11339,7 @@ in 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" && stdenv.targetPlatform.isVc4 then targetPackages.vc4-newlib or vc4-newlib 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 |