about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-07-31 19:17:22 -0700
committerGitHub <noreply@github.com>2016-07-31 19:17:22 -0700
commit535cea0eecea4e25e988d9771f2da877113f98ee (patch)
tree687933a665ab31ed1e308abf2eda865f57ca7caf
parent7333c4ac25648e831fb2033ee77fbbdc62ae492a (diff)
parente9d2c9654ac45a9c23e7811f949eabfe1f7f6841 (diff)
downloadrust-535cea0eecea4e25e988d9771f2da877113f98ee.tar.gz
rust-535cea0eecea4e25e988d9771f2da877113f98ee.zip
Auto merge of #35151 - bcully:bcully/pr-35149, r=alexcrichton
Add libarena from local rust to stage0

This was needed at least when local rust was 1.9.0 on darwin.

Fixes #35149
-rwxr-xr-xsrc/etc/local_stage0.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/etc/local_stage0.sh b/src/etc/local_stage0.sh
index 354be34b6a2..f5f39d264a6 100755
--- a/src/etc/local_stage0.sh
+++ b/src/etc/local_stage0.sh
@@ -58,6 +58,7 @@ case "$TARG_DIR" in
 
 cp ${PREFIX}/bin/rustc${BIN_SUF} ${TARG_DIR}/stage0/bin/
 cp ${PREFIX}/${LIB_DIR}/${RUSTLIBDIR}/${TARG_DIR}/${LIB_DIR}/* ${TARG_DIR}/stage0/${LIB_DIR}/
+cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}arena*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/
 cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}extra*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/
 cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}rust*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/
 cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}std*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/