* Started reorganising stdenv:
- gcc/ld-wrappers have been factored out into a separate
derivation. This allows a working gcc to be installed in the user
environment. (Previously the Nix gcc didn't work because it
needed a whole bunch of flags to point to glibc.)
- Better modularity: packages can specify hooks into the setup
scripts. For instance, setup no longer knows about the
PKG_CONFIG_PATH variable; pkgconfig can set it up instead.
- gcc not longer depends on binutils. This simplifies the bootstrap
process.
svn path=/nixpkgs/trunk/; revision=816
This commit is contained in:
@@ -1,13 +1,17 @@
|
||||
{system}: (import ../generic) {
|
||||
{stdenv}:
|
||||
|
||||
(import ../generic) {
|
||||
name = "stdenv-native";
|
||||
system = system;
|
||||
prehook = ./prehook.sh;
|
||||
posthook = ./posthook.sh;
|
||||
preHook = ./prehook.sh;
|
||||
postHook = ./posthook.sh;
|
||||
initialPath = "/usr/local /usr /";
|
||||
param1 = "";
|
||||
param2 = "";
|
||||
param3 = "";
|
||||
param4 = "";
|
||||
param5 = "";
|
||||
noSysDirs = false;
|
||||
|
||||
inherit stdenv;
|
||||
|
||||
gcc = (import ../../build-support/gcc-wrapper) {
|
||||
inherit stdenv;
|
||||
name = "gcc-native";
|
||||
isNative = true;
|
||||
gcc = "/usr";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,5 +1 @@
|
||||
export SHELL=/bin/sh
|
||||
|
||||
export NIX_CC=/usr/bin/gcc
|
||||
export NIX_CXX=/usr/bin/g++
|
||||
export NIX_LD=/usr/bin/ld
|
||||
|
||||
Reference in New Issue
Block a user