From e9ce97cc2a702679c81fa259f6dc5fca07d9cf20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aljaz=CC=8C=20=22g5pw=22=20Srebrnic=CC=8C?= Date: Thu, 4 Jul 2013 16:18:05 +0200 Subject: [PATCH] Copy the correct libs when using local-rust-root This fixes a segfault when configuring rust to use local-rust-root. The libraries were renamed in the 0.6-0.7 transition, and the script was not copying them all. I also removed the line referencing libcore (now libstd). --- src/etc/local_stage0.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/etc/local_stage0.sh b/src/etc/local_stage0.sh index 8d2fd887e3ff7..3b70f9b967fb6 100755 --- a/src/etc/local_stage0.sh +++ b/src/etc/local_stage0.sh @@ -43,7 +43,7 @@ fi cp ${PREFIX}/bin/rustc ${TARG_DIR}/stage0/bin/ cp ${PREFIX}/lib/rustc/${TARG_DIR}/${LIBDIR}/* ${TARG_DIR}/stage0/${LIBDIR}/ +cp ${PREFIX}/lib/libextra*${LIB_SUF} ${TARG_DIR}/stage0/${LIBDIR}/ cp ${PREFIX}/lib/librust*${LIB_SUF} ${TARG_DIR}/stage0/${LIBDIR}/ -cp ${PREFIX}/lib/libcore*${LIB_SUF} ${TARG_DIR}/stage0/${LIBDIR}/ cp ${PREFIX}/lib/libstd*${LIB_SUF} ${TARG_DIR}/stage0/${LIBDIR}/ cp ${PREFIX}/lib/libsyntax*${LIB_SUF} ${TARG_DIR}/stage0/${LIBDIR}/