Index: third_party/binutils/build-all.sh |
diff --git a/third_party/binutils/build-all.sh b/third_party/binutils/build-all.sh |
index 99d107056bfbb086cbdb0f72ea4b944e59f9f7c9..a39984ca2b304ade9dee49438fce7996b98170d5 100755 |
--- a/third_party/binutils/build-all.sh |
+++ b/third_party/binutils/build-all.sh |
@@ -22,7 +22,7 @@ |
fi |
# Download the source |
-VERSION=2.25 |
+VERSION=2.24 |
wget -c http://ftp.gnu.org/gnu/binutils/binutils-$VERSION.tar.bz2 |
# Verify the signature |
@@ -43,21 +43,14 @@ |
# Patch the source |
( |
cd binutils-$VERSION |
- echo "unlock-thin.patch" |
- echo "==================================" |
+ patch -p1 < ../ehframe-race.patch |
patch -p1 < ../unlock-thin.patch |
- echo "----------------------------------" |
- echo |
- echo "plugin-dso-fix.patch" |
- echo "==================================" |
patch -p1 < ../plugin-dso-fix.patch |
- echo "----------------------------------" |
- echo |
) |
fi |
for ARCH in i386 amd64; do |
- if [ ! -d precise-chroot-$ARCH ]; then |
+ if [ ! -d lucid-chroot-$ARCH ]; then |
# Refresh sudo credentials |
sudo -v |
@@ -68,11 +61,11 @@ |
sudo debootstrap \ |
--arch=$ARCH \ |
--include=build-essential,flex,bison \ |
- precise precise-chroot-$ARCH |
+ lucid lucid-chroot-$ARCH |
echo "=============================" |
fi |
- BUILDDIR=precise-chroot-$ARCH/build |
+ BUILDDIR=lucid-chroot-$ARCH/build |
# Clean up any previous failed build attempts inside chroot |
if [ -d "$BUILDDIR" ]; then |
@@ -99,7 +92,7 @@ |
echo "" |
echo "Building binutils for $ARCH" |
LOGFILE="$OUTPUTDIR/build-$ARCH.log" |
- if ! sudo $PREFIX chroot precise-chroot-$ARCH /build/build-one.sh /build/binutils-$VERSION > $LOGFILE 2>&1; then |
+ if ! sudo $PREFIX chroot lucid-chroot-$ARCH /build/build-one.sh /build/binutils-$VERSION > $LOGFILE 2>&1; then |
echo "Build failed! See $LOGFILE for details." |
exit 1 |
fi |