From d6f8494fc1b8f3b5480c5ee7f2961dec6f8d3d36 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 18 Sep 2015 13:44:01 -0700 Subject: [PATCH] Tweak a few minor things (especially BR2_x86_64) to fix segfaulting --- upstream/Dockerfile.builder | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/upstream/Dockerfile.builder b/upstream/Dockerfile.builder index a4f34fe..e706fb6 100644 --- a/upstream/Dockerfile.builder +++ b/upstream/Dockerfile.builder @@ -38,8 +38,10 @@ RUN set -x \ && rm buildroot.tar.bz2* RUN confs=' \ - BR2_TOOLCHAIN_BUILDROOT_INET_RPC \ BR2_STATIC_LIBS \ + BR2_TOOLCHAIN_BUILDROOT_INET_RPC \ + BR2_TOOLCHAIN_BUILDROOT_WCHAR \ + BR2_x86_64 \ ' \ && set -xe \ && cd /usr/src/buildroot \ @@ -79,6 +81,7 @@ RUN confs=' \ CONFIG_AR \ CONFIG_FEATURE_AR_LONG_FILENAMES \ CONFIG_FEATURE_AR_CREATE \ + CONFIG_STATIC \ ' \ && set -xe \ && make defconfig \ @@ -92,9 +95,9 @@ RUN confs=' \ done RUN set -x \ - && LDFLAGS='--static' \ - make -j$(nproc) \ - CROSS_COMPILE="$(basename /usr/src/buildroot/output/host/usr/*-buildroot-linux-uclibc)-" \ + && make -j$(nproc) \ + CROSS_COMPILE="$(basename /usr/src/buildroot/output/host/usr/*-buildroot-linux-uclibc)-" \ + busybox \ && mkdir -p rootfs/bin \ && ln -v busybox rootfs/bin/ \ && rootfs/bin/busybox --install rootfs/bin \