diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-12-27 18:14:57 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-12-27 18:14:57 +0000 |
| commit | 138c0ae751174ae6859589a9c9d517e45c14dc18 (patch) | |
| tree | f0d6067ca147457c552f2c113c5697dc99547163 /pkgs/build-support/gcc-wrapper | |
| parent | f6d923febc594c7a1fc3295e01972b049569e292 (diff) | |
| download | nixlib-138c0ae751174ae6859589a9c9d517e45c14dc18.tar nixlib-138c0ae751174ae6859589a9c9d517e45c14dc18.tar.gz nixlib-138c0ae751174ae6859589a9c9d517e45c14dc18.tar.bz2 nixlib-138c0ae751174ae6859589a9c9d517e45c14dc18.tar.lz nixlib-138c0ae751174ae6859589a9c9d517e45c14dc18.tar.xz nixlib-138c0ae751174ae6859589a9c9d517e45c14dc18.tar.zst nixlib-138c0ae751174ae6859589a9c9d517e45c14dc18.zip | |
* Merge the new generic builder.
* Removed substitute, it's part of the generic builder now. * stdenv-initial (Linux): use the real generic builder script. This does require that sed is in the path of the builder of the initial stdenv. svn path=/nixpkgs/trunk/; revision=7498
Diffstat (limited to 'pkgs/build-support/gcc-wrapper')
| -rw-r--r-- | pkgs/build-support/gcc-wrapper/builder.sh | 6 | ||||
| -rw-r--r-- | pkgs/build-support/gcc-wrapper/default.nix | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/build-support/gcc-wrapper/builder.sh b/pkgs/build-support/gcc-wrapper/builder.sh index 7ee0b0d32cdc..f9dbc0e784f6 100644 --- a/pkgs/build-support/gcc-wrapper/builder.sh +++ b/pkgs/build-support/gcc-wrapper/builder.sh @@ -1,10 +1,8 @@ source $stdenv/setup -source $substitute -mkdir $out -mkdir $out/bin -mkdir $out/nix-support +ensureDir $out/bin +ensureDir $out/nix-support if test -z "$nativeLibc"; then diff --git a/pkgs/build-support/gcc-wrapper/default.nix b/pkgs/build-support/gcc-wrapper/default.nix index 2edd0049dc17..24309c7ab879 100644 --- a/pkgs/build-support/gcc-wrapper/default.nix +++ b/pkgs/build-support/gcc-wrapper/default.nix @@ -15,7 +15,6 @@ assert !nativeLibc -> libc != null; stdenv.mkDerivation { builder = ./builder.sh; - substitute = ../substitute/substitute.sh; setupHook = ./setup-hook.sh; gccWrapper = ./gcc-wrapper.sh; ldWrapper = ./ld-wrapper.sh; |