summaryrefslogtreecommitdiffstats
path: root/doc/stdenv.xml
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2018-11-18 23:23:22 -0600
committerMatthew Bauer <mjbauer95@gmail.com>2018-11-19 13:03:23 -0600
commit9d3108c3aee8214d26218e8c2be3b4d497246fbe (patch)
treed123d5d01df02d5d4878c9a1d7869dc61d00d02b /doc/stdenv.xml
parentee58ab3cb9e727444e92ed992c02ef75d4356d6a (diff)
doc/cross-compilation: fixup
More cleanups and stuff. May need to be split up.
Diffstat (limited to 'doc/stdenv.xml')
-rw-r--r--doc/stdenv.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index 10d58f38399a..208b5e9cf302 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -258,15 +258,15 @@ genericBuild
</para>
<para>
- It is important to note dependencies are not necessarily propagated as the
- same sort of dependency that they were before, but rather as the
+ It is important to note that dependencies are not necessarily propagated as
+ the same sort of dependency that they were before, but rather as the
corresponding sort so that the platform rules still line up. The exact rules
for dependency propagation can be given by assigning to each dependency two
integers based one how its host and target platforms are offset from the
depending derivation's platforms. Those offsets are given below in the
descriptions of each dependency list attribute. Algorithmically, we traverse
propagated inputs, accumulating every propagated dependency's propagated
- dependenciess and adjusting them to account for the "shift in perspective"
+ dependencies and adjusting them to account for the "shift in perspective"
described by the current dependency's platform offsets. This results in sort
a transitive closure of the dependency relation, with the offsets being
approximately summed when two dependency links are combined. We also prune
@@ -424,7 +424,7 @@ let f(h, h + 1, i) = i + h
target offset from the new derivation's platforms. These are programs used
at build time that produce code to run with code produced by the depending
package. Most commonly, these are tools used to build the runtime or
- standard library taht the currently-being-built compiler will inject into
+ standard library that the currently-being-built compiler will inject into
any code it compiles. In many cases, the currently-being-built-compiler is
itself employed for that task, but when that compiler won't run (i.e. its
build and host platform differ) this is not possible. Other times, the