diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-24 02:58:00 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-24 02:58:00 -0400 |
commit | 205fc55ea29a843f28b8fc1932cf1b88fce6bc1d (patch) | |
tree | 60356fe690d2af5f1d761f5464bee5485db2a9d7 /pkgs/misc/uboot/nanonote.nix | |
parent | 46eeef1898ffbf57330ec31b96a6c2d89f8fcb36 (diff) | |
parent | 33b8830a85242ad09898a0c90a6f0494c34132ca (diff) | |
download | nixlib-205fc55ea29a843f28b8fc1932cf1b88fce6bc1d.tar nixlib-205fc55ea29a843f28b8fc1932cf1b88fce6bc1d.tar.gz nixlib-205fc55ea29a843f28b8fc1932cf1b88fce6bc1d.tar.bz2 nixlib-205fc55ea29a843f28b8fc1932cf1b88fce6bc1d.tar.lz nixlib-205fc55ea29a843f28b8fc1932cf1b88fce6bc1d.tar.xz nixlib-205fc55ea29a843f28b8fc1932cf1b88fce6bc1d.tar.zst nixlib-205fc55ea29a843f28b8fc1932cf1b88fce6bc1d.zip |
Merge remote-tracking branch 'upstream/staging' into compiler-rt
Diffstat (limited to 'pkgs/misc/uboot/nanonote.nix')
-rw-r--r-- | pkgs/misc/uboot/nanonote.nix | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/pkgs/misc/uboot/nanonote.nix b/pkgs/misc/uboot/nanonote.nix index 2783927ef57c..fb3b98f478e6 100644 --- a/pkgs/misc/uboot/nanonote.nix +++ b/pkgs/misc/uboot/nanonote.nix @@ -1,8 +1,5 @@ {stdenv, fetchurl, fetchgit}: -# We should enable this check once we have the cross target system information -# assert stdenv.system == "armv5tel-linux" || crossConfig == "armv5tel-linux"; - # All this file is made for the Marvell Sheevaplug stdenv.mkDerivation { @@ -30,21 +27,19 @@ stdenv.mkDerivation { sed -i -e 's/0x200000;bootm/0x400000;bootm/' include/configs/qi_lb60.h ''; - # Remove the cross compiler prefix, and add reiserfs support + makeFlags = [ + "CROSS_COMPILE=${stdenv.cc.targetPrefix}" + ]; + + # Add reiserfs support configurePhase = '' make mrproper make qi_lb60_config - sed -i /CROSS_COMPILE/d include/config.mk ''; - buildPhase = '' + preBuild= '' # A variable named 'src' used to affect the build in some uboot... - unset src - if test -z "$crossConfig"; then - make clean all - else - make clean all ARCH=mips CROSS_COMPILE=$crossConfig- - fi + unset -v src ''; dontStrip = true; @@ -59,6 +54,6 @@ stdenv.mkDerivation { ''; meta = { - platforms = [ "mipsel-linux" ]; + platforms = stdenv.lib.platforms.mips; }; } |