1 files changed, 7 insertions, 11 deletions
diff --git a/core/binutils/build b/core/binutils/build
index 67a1af16..f7e86098 100755
--- a/core/binutils/build
+++ b/core/binutils/build
@@ -1,27 +1,22 @@
 #!/bin/sh -e
 
 # 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"
+case "$3" in
+    i?86) archopts="--enable-64-bit-bfd"
 esac
 
-cat > makeinfo <<EOF
+command -v makeinfo >/dev/null || { cat > makeinfo <<EOF
 #!/bin/sh
 printf 'makeinfo (GNU texinfo) 5.2\n'
 EOF
 
 chmod +x makeinfo
 export PATH=$PATH:$PWD
+}
 
 # Word splitting is intentional here.
 # shellcheck disable=2086
-./configure \
-    --prefix=/usr \
-    $archopts \
+cpt-configure \
     --enable-targets=x86_64-pep \
     --disable-multilib \
     --disable-werror \
@@ -30,7 +25,8 @@ export PATH=$PATH:$PWD
     --disable-readline \
     --disable-gprof \
     --with-mmap \
-    --with-system-zlib
+    --with-system-zlib \
+    "$archopts"
 
 make
 make DESTDIR="$1" install