Author: eelco
Date: Thu Aug 5 16:27:46 2010
New Revision: 22966
URL: https://svn.nixos.org/websvn/nix/?rev=22966&sc=1
Log:
* Don't store the GCC configure flags in the output (visible through
`gcc -v'). It causes build-time only dependencies to be
unnecessarily retained in the closure (e.g. PPL due to
`--with-ppl=/nix/store/...').
* Replace $out/bin/c++ with a symlink to g++.
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/builder.sh
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/builder.sh
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/builder.sh
Thu Aug 5 15:47:15 2010 (r22965)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/builder.sh
Thu Aug 5 16:27:46 2010 (r22966)
@@ -143,6 +143,7 @@
dontStrip=1
fi
+
preConfigure() {
if test -n "$newlibSrc"; then
tar xvf "$newlibSrc" -C ..
@@ -172,6 +173,12 @@
}
+postConfigure() {
+ # Don't store the configure flags in the resulting executables.
+ sed -e '/TOPLEVEL_CONFIGURE_ARGUMENTS=/d' -i Makefile
+}
+
+
postInstall() {
# Remove precompiled headers for now. They are very big and
# probably not very useful yet.
@@ -200,7 +207,7 @@
fi
done
- for i in $out/bin/*-c++* $out/bin/*-g++*; do
+ for i in $out/bin/c++ $out/bin/*-c++* $out/bin/*-g++*; do
if cmp -s $out/bin/g++ $i; then
ln -sfn g++ $i
fi
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
