Remove support for the obsolete powerpc-darwin and i686-darwin platforms

This commit is contained in:
Eelco Dolstra
2012-11-29 14:10:49 +01:00
parent 4b48d05c58
commit 72684fb42f
20 changed files with 68 additions and 466 deletions
+16 -16
View File
@@ -2,11 +2,11 @@
rec {
shell =
shell =
if system == "i686-freebsd" || system == "x86_64-freebsd" then "/usr/local/bin/bash"
else "/bin/bash";
path =
path =
(if system == "i686-solaris" then [ "/usr/gnu" ] else []) ++
(if system == "i686-netbsd" then [ "/usr/pkg" ] else []) ++
["/" "/usr" "/usr/local"];
@@ -22,13 +22,13 @@ rec {
export NIX_DONT_SET_RPATH=1
export NIX_NO_SELF_RPATH=1
dontFixLibtool=1
stripAllFlags=" " # the Darwin "strip" command doesn't know "-s"
stripAllFlags=" " # the Darwin "strip" command doesn't know "-s"
xargsFlags=" "
'';
prehookFreeBSD = ''
${prehookBase}
alias make=gmake
alias tar=gtar
alias sed=gsed
@@ -41,14 +41,14 @@ rec {
prehookOpenBSD = ''
${prehookBase}
alias make=gmake
alias grep=ggrep
alias mv=gmv
alias ln=gln
alias sed=gsed
alias tar=gtar
export MAKE=gmake
shopt -s expand_aliases
@@ -58,20 +58,20 @@ rec {
prehookNetBSD = ''
${prehookBase}
alias make=gmake
alias sed=gsed
alias tar=gtar
export MAKE=gmake
shopt -s expand_aliases
# Filter out stupid GCC warnings (in gcc-wrapper).
export NIX_GCC_NEEDS_GREP=1
'';
prehookCygwin = ''
${prehookBase}
if test -z "$cygwinConfigureEnableShared"; then
export configureFlags="$configureFlags --disable-shared"
fi
@@ -81,17 +81,17 @@ rec {
# A function that builds a "native" stdenv (one that uses tools in
# /usr etc.).
# /usr etc.).
makeStdenv =
{ gcc, fetchurl, extraPath ? [], overrides ? (pkgs: { }) }:
import ../generic {
preHook =
if system == "i686-darwin" || system == "powerpc-darwin" || system == "x86_64-darwin" then prehookDarwin else
if system == "x86_64-darwin" then prehookDarwin else
if system == "i686-freebsd" then prehookFreeBSD else
if system == "x86_64-freebsd" then prehookFreeBSD else
if system == "i686-openbsd" then prehookOpenBSD else
if system == "i686-netbsd" then prehookNetBSD else
if system == "i686-netbsd" then prehookNetBSD else
prehookBase;
initialPath = extraPath ++ path;
@@ -106,7 +106,7 @@ rec {
gcc = "/no-such-path";
fetchurl = null;
};
gcc = import ../../build-support/gcc-wrapper {
name = "gcc-native";
@@ -116,14 +116,14 @@ rec {
stdenv = stdenvBoot0;
};
fetchurl = import ../../build-support/fetchurl {
stdenv = stdenvBoot0;
# Curl should be in /usr/bin or so.
curl = null;
};
# First build a stdenv based only on tools outside the store.
stdenvBoot1 = makeStdenv {
inherit gcc fetchurl;