about summary refs log tree commit diff
path: root/src/libstd/sys/unix/stack_overflow.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-03-29 18:03:35 -0700
committerbors <bors@rust-lang.org>2016-03-29 18:03:35 -0700
commitb678600ac94ee9cf3e679bb6128cd77b169231cb (patch)
treed893572cf57e5dfb7baa5b0a540911575b69c6b1 /src/libstd/sys/unix/stack_overflow.rs
parentec666a597743ad57f514d8f271291a8a1f5a0ff0 (diff)
parent694d88394b824fecf90176c9d1a38631fd33d468 (diff)
downloadrust-b678600ac94ee9cf3e679bb6128cd77b169231cb.tar.gz
rust-b678600ac94ee9cf3e679bb6128cd77b169231cb.zip
Auto merge of #32576 - alexcrichton:metadata-for-our-crates, r=brson
mk: Fix cross-host builds

The change in b20e748 had the unintended consequence of breaking cross-host
builds as we apparently relied on the incorrect definition of this variable in
the makefiles. That change, however, was required to get tests passing so we
couldn't just revert it.

This commit fixes the underlying bug by leaving the "more correct" definition of
`LD_LIBRARY_PATH_ENV_TARGETDIR` (also fixing it with a hardcoded reference to
`CFG_BUILD`) and updating the `RPATH_VAR` definition below. Turned out we
already had special-casing logic for passing `--cfg stage1` during the
well-we-print-this-as-stage0 build of a cross-host. That logic was just updated
to pull from a different variable as opposed to relying on the definition of
that variable to accommodate this.

Closes #32568
Diffstat (limited to 'src/libstd/sys/unix/stack_overflow.rs')
0 files changed, 0 insertions, 0 deletions