* Disable dynamic linking on Cygwin until we figure out how to deal

with the lack of an RPATH.

svn path=/nixpkgs/trunk/; revision=5362
This commit is contained in:
Eelco Dolstra 2006-06-01 09:41:31 +00:00
parent c067e6afa2
commit d9d8a1dd57
3 changed files with 33 additions and 15 deletions

View file

@ -0,0 +1,24 @@
{stdenv, genericStdenv, gccWrapper}:
genericStdenv {
name = "stdenv-native";
preHook = ./prehook.sh;
initialPath = "/usr/local /usr /";
inherit stdenv;
gcc = gccWrapper {
name = "gcc-native";
nativeTools = true;
nativeGlibc = true;
nativePrefix = "/usr";
inherit stdenv;
};
shell = "/bin/bash";
extraAttrs = {
# Curl should be in /usr/bin or so.
curl = null;
};
}

View file

@ -0,0 +1,2 @@
export NIX_ENFORCE_PURITY=
export configureFlags="$configureFlags --disable-shared"

View file

@ -43,15 +43,9 @@ rec {
inherit genericStdenv gccWrapper;
};
stdenvNixPkgs = allPackages {
bootStdenv = stdenvNix;
noSysDirs = false;
};
# Linux standard environment.
inherit (import ./linux {inherit allPackages;})
stdenvLinux stdenvLinuxPkgs;
inherit (import ./linux {inherit allPackages;}) stdenvLinux;
# Darwin (Mac OS X) standard environment. Very simple for now
@ -61,11 +55,6 @@ rec {
inherit genericStdenv gccWrapper;
};
stdenvDarwinPkgs = allPackages {
bootStdenv = stdenvDarwin;
noSysDirs = false;
};
# FreeBSD standard environment. Right now this is more or less the
# same as the native environemnt. Eventually we'll want a pure
@ -75,9 +64,11 @@ rec {
inherit genericStdenv gccWrapper;
};
stdenvFreeBSDPkgs = allPackages {
bootStdenv = stdenvFreeBSD;
noSysDirs = false;
# Cygwin standard environment.
stdenvCygwin = (import ./cygwin) {
stdenv = stdenvInitial;
inherit genericStdenv gccWrapper;
};
@ -85,6 +76,7 @@ rec {
stdenv =
if system == "i686-linux" then stdenvLinux
else if system == "i686-freebsd" then stdenvFreeBSD
else if system == "i686-cygwin" then stdenvCygwin
else if system == "powerpc-darwin" then stdenvDarwin
else stdenvNative;
}