Skip to content

Commit e9ce97c

Browse files
committed
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).
1 parent e07e9bb commit e9ce97c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/etc/local_stage0.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ fi
4343

4444
cp ${PREFIX}/bin/rustc ${TARG_DIR}/stage0/bin/
4545
cp ${PREFIX}/lib/rustc/${TARG_DIR}/${LIBDIR}/* ${TARG_DIR}/stage0/${LIBDIR}/
46+
cp ${PREFIX}/lib/libextra*${LIB_SUF} ${TARG_DIR}/stage0/${LIBDIR}/
4647
cp ${PREFIX}/lib/librust*${LIB_SUF} ${TARG_DIR}/stage0/${LIBDIR}/
47-
cp ${PREFIX}/lib/libcore*${LIB_SUF} ${TARG_DIR}/stage0/${LIBDIR}/
4848
cp ${PREFIX}/lib/libstd*${LIB_SUF} ${TARG_DIR}/stage0/${LIBDIR}/
4949
cp ${PREFIX}/lib/libsyntax*${LIB_SUF} ${TARG_DIR}/stage0/${LIBDIR}/

0 commit comments

Comments
 (0)