Author: eelco
Date: Tue Sep 13 08:52:06 2011
New Revision: 29233
URL: https://ssl.nixos.org/websvn/nix/?rev=29233&sc=1
Log:
* Doh.
Modified:
nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix
Modified: nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix
==============================================================================
--- nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix Mon Sep 12
21:30:04 2011 (r29232)
+++ nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix Tue Sep 13
08:52:06 2011 (r29233)
@@ -358,13 +358,12 @@
echo tracing: $builder $realArgs
set +o posix
${pkgs.coreutils}/bin/mkdir -p $out/.trace $out/.build
- cd $out/.build
# Compress the strace output on the fly. The builder's stderr
# also goes to the log so that the trace processor can see stuff
# like Make trace messages.
exec 4> >(${pkgs.bzip2}/bin/bzip2 > $out/.trace/log.bz2)
exec 5> >(${pkgs.coreutils}/bin/tee /dev/fd/4)
- ${pkgs.strace}/bin/strace -e trace=file,process,dup,dup2,close,pipe -v
-q -f -s 512 -o /dev/fd/4 ${pkgs.stdenv.shell} -c '(cd $TMPDIR && $builder
$realArgs)' 2>&5
+ ${pkgs.strace}/bin/strace -e trace=file,process,dup,dup2,close,pipe -v
-q -f -s 512 -o /dev/fd/4 ${pkgs.stdenv.shell} -c 'cd $out/.build; exec
$builder $realArgs' 2>&5
(cd $out && ${pkgs.gnutar}/bin/tar c .build | ${pkgs.bzip2}/bin/bzip2 >
.build.tar.bz2 && ${pkgs.coreutils}/bin/chmod -R u+w .build &&
${pkgs.coreutils}/bin/rm -rf .build)
'';
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
