binutils: revert for now

1 files changed, 4 insertions, 33 deletions

diff --git a/core/binutils/build b/core/binutils/build
index 06e14461..67a1af16 100755
--- a/core/binutils/build
+++ b/core/binutils/build
@@ -1,15 +1,12 @@
 #!/bin/sh -e
 
-export LDFLAGS="$LDFLAGS -static"
-export CCLD="${CC:-cc} -all-static"
-
 # Architecture specific build options
 case ${3:-$(uname -m)} in
     i*86)  archopts="--build=i686-pc-linux-musl \
                      --host=i686-pc-linux-musl \
                      --enable-64-bit-bfd" ;;
-    x86-64) archopts="--build=x86_64-pc-linux-musl \
-                      --host=x86-64-pc-linux-musl"
+    x86_64) archopts="--build=x86_64-pc-linux-musl \
+                      --host=x86_64-pc-linux-musl"
 esac
 
 cat > makeinfo <<EOF
@@ -27,39 +24,13 @@ export PATH=$PATH:$PWD
     $archopts \
     --enable-targets=x86_64-pep \
     --disable-multilib \
-    --disable-shared \
     --disable-werror \
     --disable-gdb \
     --disable-nls \
     --disable-readline \
     --disable-gprof \
     --with-mmap \
-    --with-static-standard-libraries \
     --with-system-zlib
 
-# Linking binutils statically is HARD. configure script
-# and the main Makefile straight up ignores our flags.
-#
-# I would have never thought that linking binutils
-# statically would lead to a size reduction, but
-# it gets 2MB smaller (25 to 23MB).
-make configure-bfd
-make configure-ld
-make configure-libctf
-
-make -C libiberty CCLD="$CCLD"
-make -C bfd       CCLD="$CCLD"
-make -C libctf    CCLD="$CCLD"
-make -C ld        CCLD="$CCLD"
-
-make configure-opcodes
-make configure-binutils
-make configure-gas
-
-make -C opcodes  CCLD="$CCLD"
-make -C binutils CCLD="$CCLD"
-make -C gas      CCLD="$CCLD"
-
-for dir in libiberty bfd libctf ld opcodes binutils gas; do
-    make -C "$dir" DESTDIR="$1" install
-done
+make
+make DESTDIR="$1" install