development/cargo
development/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo synced 2024-10-01 13:33:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Continue to tweak the win64 build process on the bots

Browse source
This commit is contained in:
Alex Crichton 2014-09-16 20:31:20 -07:00
parent 05c3079db6
commit 2830efec61
2 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.travis.install.deps.sh
View file

@ -65,14 +65,12 @@ else
curl -O http://$host/dist/rust-nightly-$v32.exe
curl -O http://$host/dist/rust-nightly-$v64.exe
if [ "${BITS}" = "64" ]; then
# innoextract comes from the mingw-w64-x86_64-innoextract package
innoextract rust-nightly-$v64.exe
mv app rustc
innoextract rust-nightly-$v32.exe
mv app/bin/libgcc_s_dw2-1.dll rustc/bin
rm -rf app
innounp -y -x rust-nightly-$v64.exe
mv '{app}' rustc
innounp -y -x rust-nightly-$v32.exe
mv '{app}/bin/libgcc_s_dw2-1.dll' rustc/bin
rm -rf '{app}'
else
# innounp came from a random download on the internet! (search google)
innounp -y -x rust-nightly-$v32.exe
mv '{app}' rustc
fi

6
configure vendored
View file

@ -355,12 +355,6 @@ CFG_MANDIR=${CFG_MANDIR%/}
CFG_HOST="$(echo $CFG_HOST | tr ',' ' ')"
CFG_TARGET="$(echo $CFG_TARGET | tr ',' ' ')"
# Temporary support for the old windows triples. Remove when rust also removes
# this
CFG_BUILD=`echo "${CFG_BUILD}" | sed 's/-pc-mingw32/-w64-mingw32/g'`
CFG_HOST=`echo "${CFG_HOST}" | sed 's/-pc-mingw32/-w64-mingw32/g'`
CFG_TARGET=`echo "${CFG_TARGET}" | sed 's/-pc-mingw32/-w64-mingw32/g'`
# copy host-triples to target-triples so that hosts are a subset of targets
V_TEMP=""
for i in $CFG_HOST $CFG_TARGET;