treewide: Get rid of all uses of crossConfig

The hack of using `crossConfig` to enforce stricter handling of
dependencies is replaced with a dedicated `strictDeps` for that purpose.
(Experience has shown that my punning was a terrible idea that made more
difficult and embarrising to teach teach.)

Now that is is clear, a few packages now use `strictDeps`, to fix
various bugs:

 - bintools-wrapper and cc-wrapper
This commit is contained in:
John Ericson
2018-05-14 23:30:37 -04:00
parent d7160f39bd
commit 330ca731e8
22 changed files with 111 additions and 138 deletions
+8 -13
View File
@@ -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;
};
}