From b1a39b7fa43f9e47d667577b9f25e198c219eb64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Mon, 25 Sep 2017 16:49:42 +0300
Subject: [PATCH] Drop an old workaround

This probably isn't necessary when we now use the proper llvm-dlltool
instead of genlib.
---
 Dockerfile | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d10cd5f..91aa1d5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -78,11 +78,6 @@ ENV AS=llvm-as
 ENV NM=llvm-nm
 
 # Build mingw with our freshly built cross compiler
-# Since somewhere between llvm 3.8 and 3.9, SVN rev 273373, git mirror commit
-# d319cd64a4a15,, llvm-ar tries to detect the format (gnu vs bsd) of the
-# existing .a file. For files generated by genlib, it seems to detect the
-# wrong format, leading to lld later segfaulting when trying to link.
-# Force the flag -format gnu to llvm-ar in this step to work around this issue.
 RUN cd mingw-w64/mingw-w64-crt && \
     for arch in armv7 aarch64 i686 x86_64; do \
         mkdir build-$arch && cd build-$arch && \
@@ -101,7 +96,7 @@ RUN cd mingw-w64/mingw-w64-crt && \
             ;; \
         esac && \
         CC=$arch-w64-mingw32-clang \
-        AR="llvm-ar -format gnu" DLLTOOL=llvm-dlltool ../configure --host=$arch-w64-mingw32 --prefix=$TOOLCHAIN_PREFIX/$arch-w64-mingw32 $FLAGS && \
+        AR=llvm-ar DLLTOOL=llvm-dlltool ../configure --host=$arch-w64-mingw32 --prefix=$TOOLCHAIN_PREFIX/$arch-w64-mingw32 $FLAGS && \
         make -j4 && make install && \
         cd .. || exit 1; \
     done