public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

misc hurd stuff: Get rid of crossConfig

Browse Source 
This stuff is horribly bit-rotted anyways, but I'm getting rid of
crossConfig so it must be changed.
This commit is contained in:
John Ericson 2018-05-14 20:33:54 -04:00
parent 9be118223b
commit 84868b8b06
2 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkgs/os-specific/gnu/hurd/default.nix
View File

@ -75,25 +75,16 @@ stdenv.mkDerivation ({
// //
(if !headersOnly && buildTarget != null stdenv.lib.optionalAttrs (!headersOnly && buildTarget != null) {
then assert installTarget != null; { # Use the default `buildPhase' and `installPhase' so that the usual hooks
# Use the default `buildPhase' and `installPhase' so that the usual hooks # can still be used.
# can still be used. buildFlags = buildTarget;
buildFlags = buildTarget; installTargets = assert installTarget != null; installTarget;
installTargets = installTarget; }
}
else {})
// //
(if headersOnly stdenv.lib.optionalAttrs headersOnly {
then { dontBuild = true; installPhase = "make install-headers"; } dontBuild = true;
else (if (cross != null) installPhase = "make install-headers";
then { })
crossConfig = cross.config;
# The `configure' script wants to build executables so tell it where
# to find `crt1.o' et al.
LDFLAGS = "-B${glibcCross}/lib";
}
else { })))

2
pkgs/os-specific/gnu/libpthread/default.nix
View File

@ -55,8 +55,6 @@ stdenv.mkDerivation ({
(if cross != null (if cross != null
then { then {
crossConfig = cross.config;
# Tell gcc where to find `crt1.o' et al. This is specified in two # Tell gcc where to find `crt1.o' et al. This is specified in two
# different ways: one for gcc as run from `configure', and one for linking # different ways: one for gcc as run from `configure', and one for linking
# libpthread.so (by default `libtool --mode=link' swallows `-B', hence # libpthread.so (by default `libtool --mode=link' swallows `-B', hence