* Folded the Cygwin, powerpc-darwin and FreeBSD stdenv into the "native"

stdenv. svn path=/nixpkgs/trunk/; revision=12147
2008-06-18 15:09:13 +00:00
parent aab9aee56e
commit 7bf0c5ba01
14 changed files with 122 additions and 173 deletions
@@ -1,24 +1,101 @@
-{stdenv, genericStdenv, gccWrapper}:
+{stdenvInitial}:

-genericStdenv {
-  name = "stdenv-native";
-  preHook = ./prehook.sh;
-  initialPath = "/usr/local /usr /";
+let

-  inherit stdenv;
-
-  gcc = gccWrapper {
-    name = "gcc-native";
-    nativeTools = true;
-    nativeLibc = true;
-    nativePrefix = "/usr";
-    inherit stdenv;
-  };
+  system = stdenvInitial.system;

  shell = "/bin/bash";

-  extraAttrs = {
-    # Curl should be in /usr/bin or so.
-    curl = null;
+
+  prehookBase = builtins.toFile "prehook-base.sh" ''
+    # Disable purity tests; it's allowed (even needed) to link to
+    # libraries outside the Nix store (like the C library).
+    export NIX_ENFORCE_PURITY=
+  '';
+
+  prehookDarwin = builtins.toFile "prehook-darwin.sh" ''
+    source ${prehookBase}
+    export NIX_DONT_SET_RPATH=1
+    export NIX_NO_SELF_RPATH=1
+    dontFixLibtool=1
+    NIX_STRIP_DEBUG=0
+    stripAllFlags=" " # the Darwin "strip" command doesn't know "-s" 
+  '';
+
+  prehookFreeBSD = builtins.toFile "prehook-freebsd.sh" ''
+    source ${prehookBase}
+    
+    alias make=gmake
+    export MAKE=gmake
+    shopt -s expand_aliases
+
+    # Filter out stupid GCC warnings (in gcc-wrapper).
+    export NIX_GCC_NEEDS_GREP=1
+  '';
+
+  prehookCygwin = builtins.toFile "prehook-cygwin.sh" ''
+    source ${prehookBase}
+    
+    if test -z "$cygwinConfigureEnableShared"; then
+      export configureFlags="$configureFlags --disable-shared"
+    fi
+
+    PATH_DELIMITER=';'
+  '';
+
+
+  # A function that builds a "native" stdenv (one that uses tools in
+  # /usr etc.).  
+  makeStdenv = {stdenvBoot, extraPath, forceFetchurlBoot}: import ../generic {
+    name = "stdenv-native";
+
+    preHook =
+      if system == "i686-darwin" || system == "powerpc-darwin" then prehookDarwin else
+      if system == "i686-freebsd" then prehookFreeBSD else
+      prehookBase;
+
+    initialPath = extraPath ++ ["/" "/usr" "/usr/local"];
+
+    stdenv = stdenvBoot;
+
+    gcc = import ../../build-support/gcc-wrapper {
+      name = "gcc-native";
+      nativeTools = true;
+      nativeLibc = true;
+      nativePrefix = "/usr";
+      stdenv = stdenvBoot;
+    };
+
+    inherit shell forceFetchurlBoot;
+
+    fetchurlBoot = import ../../build-support/fetchurl {
+      stdenv = stdenvBoot;
+      # Curl should be in /usr/bin or so.
+      curl = null;
+    };
  };
-}
+
+
+  # First build a stdenv based only on tools outside the store.
+  stdenvBoot1 = makeStdenv {
+    stdenvBoot = stdenvInitial;
+    extraPath = [];
+    forceFetchurlBoot = true;
+  };
+
+  stdenvBoot1Pkgs = import ../../.. {
+    inherit system;
+    bootStdenv = stdenvBoot1;
+  };
+
+
+  # Using that, build a stdenv that adds the `replace' command (which
+  # most systems don't have, so we mustn't rely on the native
+  # environment providing it).
+  stdenvBoot2 = makeStdenv {
+    stdenvBoot = stdenvBoot1;
+    extraPath = [stdenvBoot1Pkgs.replace];
+    forceFetchurlBoot = false;
+  };
+
+in stdenvBoot2