Lluís Batlle i Rossell
719ba63004
Merge branch 'stdenv-updates' into pi-stdenv-updates
...
Conflicts:
pkgs/development/compilers/gcc/4.6/default.nix
pkgs/development/compilers/gcc/4.7/default.nix
The 4.7 had some weird parameters added in crossAttrs; I've removed
them, but I don't understand where they come from.
2012-12-28 20:14:01 +00:00
Lluís Batlle i Rossell
f2f50c42d2
gcc47: adding --with-float option to gcc builder
...
Meant for cross-building. I need that for the raspberrypi
bootstrap-tools. Before this, its bootstrap-tools gcc built
for softfloat by default.
2012-12-28 21:12:57 +01:00
Eelco Dolstra
88b11196c1
Clean up redundant "if condition then true else false"
2012-12-28 19:57:47 +01:00
Eelco Dolstra
84779a6f7d
Remove unnecessary parentheses around if conditions
...
Pet peeve...
2012-12-28 19:54:15 +01:00
Eelco Dolstra
e2d505b24e
More renames
2012-12-28 19:42:10 +01:00
Eelco Dolstra
dcdef5a0fe
More random cleanup
2012-12-28 19:37:42 +01:00
Eelco Dolstra
22ba03c123
Random cleanup: use "or" in adapters.nix
2012-12-28 19:35:35 +01:00
Eelco Dolstra
3fa03df78c
openssh: Remvoe unused Perl dependency
...
Since "buildNativeInputs" was misspelled, Perl is not actually used.
2012-12-28 19:26:28 +01:00
Eelco Dolstra
ab3eeabfed
Rename buildNativeInputs -> nativeBuildInputs
...
Likewise for propagatedBuildNativeInputs, etc. "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Eelco Dolstra
5be0a9acd7
Rename hostDrv -> crossDrv, buildDrv -> nativeDrv
...
This is for consistency with terminology in stdenv (and the terms
"hostDrv" and "buildDrv" are not very intuitive, even if they're
consistent with GNU terminology).
2012-12-28 19:08:19 +01:00
Lluís Batlle i Rossell
affca4a11c
Making the raspberrypi glibc include hard float.
2012-12-28 16:53:18 +00:00
Lluís Batlle i Rossell
33d3cf2d1c
Fixes in make-bootstrap-tools-crosspi.nix
...
It doesn't reference <nixpkgs> anymore. And I fixed the indentation.
2012-12-28 16:39:54 +00:00
Eelco Dolstra
f4ed8a3b91
Remove trailing whitespace
2012-12-28 16:41:56 +01:00
Eelco Dolstra
cf8daf6312
Add an option ‘stdenv.userHook’ to set a global stdenv setup hook
...
This allows various applications. It allows users to set global
optimisation flags, e.g.
stdenv.userHook = ''NIX_CFLAGS_COMPILE+=" -funroll-loops"'';
But the impetus is as an alternative to issue #229 , allowing impure
stdenv setup for people who want to use distcc:
stdenv.userHook = "source /my/impure/setup-script.sh";
This is probably a bad idea, but at least now it's a bad idea in
people's configuration and not in Nixpkgs. :-)
2012-12-28 16:36:09 +01:00
Eelco Dolstra
6fd4f63530
Revert "Merge pull request #229 from viric/niximpure2-stdenv-updates"
...
This reverts commit e04b17bfba
, reversing
changes made to 1af2ada7d4
.
2012-12-28 15:46:45 +01:00
Lluís Batlle i Rossell
095db9fe3f
stdenv: Stripping out/lib32 too
...
If not, in mips64/n32, lib32/libiberty.a was left without stripping, and
it contained (debug) references to bootstrap-tools.
2012-12-27 23:36:01 +01:00
Lluís Batlle i Rossell
ab2520c383
Adding linux-3.6-rpi
...
I picked the change from
7b4d69eeff
2012-12-27 21:29:56 +00:00
Lluís Batlle i Rossell
ee2f05d683
Removing unneeded changes in stdenvLinux, for the pi.
...
I had those changes from the time when I wanted to bootstrap
its stdenvLinux from armv5tel bootstrap-tools. But that
never worked.
2012-12-27 15:19:23 +00:00
Lluís Batlle i Rossell
c41881842b
Merge branch 'stdenv-updates' into pi-stdenv-updates
2012-12-27 15:10:55 +00:00
Lluís Batlle i Rossell
636303797f
gcc47: moving the bootstrap logic into nix
...
It was in the builder.sh. Similar to the previous patch
to gcc46.
2012-12-27 15:08:17 +00:00
Lluís Batlle i Rossell
f94f53a54e
gcc46: moving the bootstrap logic into nix
...
It was in the builder.sh.
2012-12-27 15:08:16 +00:00
viric
e04b17bfba
Merge pull request #229 from viric/niximpure2-stdenv-updates
...
Allow /niximpure/impure.sh impurity, only for users wanting it
2012-12-27 07:04:56 -08:00
Lluís Batlle i Rossell
d05b33653e
gcc47: moving the bootstrap logic into nix
...
It was in the builder.sh. Similar to the previous patch
to gcc46.
2012-12-27 14:57:32 +00:00
Lluís Batlle i Rossell
e9365882c1
gcc46: moving the bootstrap logic into nix
...
It was in the builder.sh.
2012-12-27 14:54:44 +00:00
Lluís Batlle i Rossell
120499c03a
Setting a public URL for the pi bootstrap tools
2012-12-26 22:42:57 +00:00
Lluís Batlle i Rossell
2717392cbf
The glibc doesn't like "gnueabihf" in the triplet.
...
I better set "gnueabi".
2012-12-26 22:01:55 +00:00
Lluís Batlle i Rossell
96b0de4c33
gcc4.7: making the cross-built gcc respect withAbi, withArch, ...
2012-12-26 22:01:51 +00:00
Lluís Batlle i Rossell
5258c8a0c6
Going with armv6l-linux bootstrap-tools.
...
I had lost this change in some branch.
2012-12-26 22:01:41 +00:00
Lluís Batlle i Rossell
764ebc29ab
Adding the armv6l bootstrap; I forgot that file in previous commits.
2012-12-26 22:01:36 +00:00
Lluís Batlle i Rossell
50ae899f62
Removing a glibc outdated mention in stdenvLinux
2012-12-26 22:01:31 +00:00
Lluís Batlle i Rossell
0af1283e97
Undoing more glibc unneeded changes
2012-12-26 22:01:26 +00:00
Lluís Batlle i Rossell
68a65bcf2a
Undoing glibc 2.13 work for the pi
...
(previous attempt of bootstrapping from the armv5tel bootstrap tools)
2012-12-26 22:01:22 +00:00
Lluís Batlle i Rossell
6c9002639d
I forgot to undo a gcc46 unneeded change.
2012-12-26 22:01:17 +00:00
Lluís Batlle i Rossell
164a84f8f4
Restoring the gcc 4.6 builder. No need to change it.
2012-12-26 22:01:13 +00:00
Lluís Batlle i Rossell
4c8bca317b
Improving the bootstrap tools (missing libs)
2012-12-26 22:01:08 +00:00
Lluís Batlle i Rossell
eeb9720b92
Fixing the bootstrap-tools-crosspi for gcc47
2012-12-26 22:00:58 +00:00
Lluís Batlle i Rossell
a29b4228e9
Typo in 4.7 builder.sh
2012-12-26 22:00:53 +00:00
Lluís Batlle i Rossell
52ee2b99ee
gcc47: fix on configureFlags, for cross-built gcc
2012-12-26 22:00:48 +00:00
Lluís Batlle i Rossell
43fac48f15
gcc47: trying to fix cross-building a gcc
2012-12-26 22:00:44 +00:00
Lluís Batlle i Rossell
f16193bd99
Setting gcc47 for the cross build tools
2012-12-26 22:00:39 +00:00
Lluís Batlle i Rossell
651734b619
gcc/gcc-cross-wrapper: making gcc47 work with uclibc
...
It wants pthreads, and libpthreads wants libdl, and this can
only be found with -rpath-link when cross building.
2012-12-26 22:00:33 +00:00
Lluís Batlle i Rossell
2194b98565
Removing any cross-building kind of native build for the pi.
2012-12-26 22:00:29 +00:00
Lluís Batlle i Rossell
5b975f3c90
Adding an attempt to crossbuild bootstrap tools for the pi.
...
Based on the cross/make-bootstrap-tools.nix I had for the sheevaplug
in my nixos.org svn configuration directory.
2012-12-26 22:00:24 +00:00
Lluís Batlle i Rossell
fc51895afe
Get gccs understand 'fpu'
2012-12-26 22:00:20 +00:00
Lluís Batlle i Rossell
9fdd9d51bd
Setting some kind of cross-compiler situation, for armv6l gnueabihf.
2012-12-26 22:00:15 +00:00
Lluís Batlle i Rossell
b520b4aeee
Fixing my bash scripting of the previous commit
2012-12-26 22:00:11 +00:00
Lluís Batlle i Rossell
43fc5ae7cf
Trying to fix the gcc builder; I added pi flags in the wrong if/else branch.
2012-12-26 22:00:07 +00:00
root
32c061146d
Making gcc use some extra flags to build the proper hardfp gcc.
...
This commit breaks non-raspberrypi; just testing.
2012-12-26 22:00:02 +00:00
root
a30086c8d5
Disabling ppl and cloog on gcc for raspberrypi. Shorter stdenv builds.
2012-12-26 21:59:58 +00:00
root
1b29d29c76
First movement to get the raspberrypi stdenv building.
2012-12-26 21:59:54 +00:00