diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-23 20:24:27 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-23 20:24:27 -0400 |
commit | 87fab3d6a548fe4e10d84a8f3d8abdea65c2a9cd (patch) | |
tree | 8ccfb9bda2e3121ca35fbca93f2680c7c71a9d6e /doc/stdenv.xml | |
parent | 56761c9b3d6f829a4f80e02d18fff30e8a6af1eb (diff) | |
parent | f43ae985a68e515197c57de5ab8413d63ae6ef1a (diff) | |
download | nixpkgs-87fab3d6a548fe4e10d84a8f3d8abdea65c2a9cd.tar nixpkgs-87fab3d6a548fe4e10d84a8f3d8abdea65c2a9cd.tar.gz nixpkgs-87fab3d6a548fe4e10d84a8f3d8abdea65c2a9cd.tar.bz2 nixpkgs-87fab3d6a548fe4e10d84a8f3d8abdea65c2a9cd.tar.lz nixpkgs-87fab3d6a548fe4e10d84a8f3d8abdea65c2a9cd.tar.xz nixpkgs-87fab3d6a548fe4e10d84a8f3d8abdea65c2a9cd.tar.zst nixpkgs-87fab3d6a548fe4e10d84a8f3d8abdea65c2a9cd.zip |
Merge some merged cross-compilation PRs into into staging
Diffstat (limited to 'doc/stdenv.xml')
-rw-r--r-- | doc/stdenv.xml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 9ec14d5a782..e637962fbb7 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -641,6 +641,16 @@ script) if it exists.</para> </varlistentry> <varlistentry> + <term><varname>configurePlatforms</varname></term> + <listitem><para> + By default, when cross compiling, the configure script has <option>--build=...</option> and <option>--host=...</option> passed. + Packages can instead pass <literal>[ "build" "host" "target" ]</literal> or a subset to control exactly which platform flags are passed. + Compilers and other tools should use this to also pass the target platform, for example. + Note eventually these will be passed when in native builds too, to improve determinism: build-time guessing, as is done today, is a risk of impurity. + </para></listitem> + </varlistentry> + + <varlistentry> <term><varname>preConfigure</varname></term> <listitem><para>Hook executed at the start of the configure phase.</para></listitem> |