From 9e270c951a5ba4d3c015253aa2b68c09fdd142af Mon Sep 17 00:00:00 2001
From: Emile Vauge <emile@vauge.com>
Date: Tue, 5 Jul 2016 16:02:36 +0200
Subject: [PATCH] Fix windows builds

Signed-off-by: Emile Vauge <emile@vauge.com>
---
 glide.lock         |  8 +++-----
 glide.yaml         |  2 +-
 script/crossbinary | 29 ++++++++++++++---------------
 3 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/glide.lock b/glide.lock
index d2013c119..c2c0495a3 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: b9d7a2fa4fe03a52e8239223ded2db0372cda7de452ea36a7e10eb04bd791b91
-updated: 2016-07-04T18:12:56.78124934+02:00
+hash: 22c20a7d7419e9624267d7f0041cd8ad87afc876d2738fa559527c74f9917c3a
+updated: 2016-07-05T14:48:30.023831407+02:00
 imports:
 - name: github.com/boltdb/bolt
   version: 3f7947a25d970e1e5f512276c14d5dcf731ccd5e
@@ -108,8 +108,6 @@ imports:
   version: 3b5eb2973efff7af33cfb65141deaf4ed25c6d02
 - name: github.com/libkermit/docker-check
   version: bb75a86b169c6c5d22c0ee98278124036f272d7b
-- name: github.com/mailgun/log
-  version: 2f35a4607f1abf71f97f77f99b0de8493ef6f4ef
 - name: github.com/mailgun/manners
   version: fada45142db3f93097ca917da107aa3fad0ffcb5
 - name: github.com/mailgun/timetools
@@ -160,7 +158,7 @@ imports:
 - name: github.com/vdemeester/shakers
   version: 24d7f1d6a71aa5d9cbe7390e4afb66b7eef9e1b3
 - name: github.com/vulcand/oxy
-  version: b57d6706e9ff606343c596940b60df7f90012d29
+  version: 8d476862d38b9be356eaa83b5712cad561be08a1
   repo: https://github.com/containous/oxy.git
   vcs: git
   subpackages:
diff --git a/glide.yaml b/glide.yaml
index c3a82282e..3ca211d25 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -10,7 +10,7 @@ import:
 - package: github.com/containous/flaeg
   version: b98687da5c323650f4513fda6b6203fcbdec9313
 - package: github.com/vulcand/oxy
-  version: b57d6706e9ff606343c596940b60df7f90012d29
+  version: 8d476862d38b9be356eaa83b5712cad561be08a1
   repo: https://github.com/containous/oxy.git
   vcs: git
   subpackages:
diff --git a/script/crossbinary b/script/crossbinary
index 1f9f5971c..055dc5210 100755
--- a/script/crossbinary
+++ b/script/crossbinary
@@ -6,20 +6,6 @@ if ! test -e autogen/gen.go; then
 	false
 fi
 
-if [ -z "$1" ]; then
-    # Remove windows platform because of
-    # https://github.com/mailgun/log/issues/10
-    OS_PLATFORM_ARG=(linux)
-else
-    OS_PLATFORM_ARG=($1)
-fi
-
-if [ -z "$2" ]; then
-    OS_ARCH_ARG=(386 amd64 arm)
-else
-    OS_ARCH_ARG=($2)
-fi
-
 if [ -z "$VERSION" ]; then
     VERSION=$(git rev-parse HEAD)
 fi
@@ -31,7 +17,20 @@ fi
 # Get rid of existing binaries
 rm -f dist/traefik_*
 
-# Build binaries
+# Build 386 amd64 binaries
+OS_PLATFORM_ARG=(linux darwin windows)
+OS_ARCH_ARG=(386 amd64)
+for OS in ${OS_PLATFORM_ARG[@]}; do
+  for ARCH in ${OS_ARCH_ARG[@]}; do
+    echo "Building binary for $OS/$ARCH..."
+    GOARCH=$ARCH GOOS=$OS CGO_ENABLED=0 go build -ldflags "-s -w -X main.Version=$VERSION -X main.BuildDate=$DATE" -o "dist/traefik_$OS-$ARCH" .
+  done
+done
+
+
+# Build arm binaries
+OS_PLATFORM_ARG=(linux)
+OS_ARCH_ARG=(arm arm64)
 for OS in ${OS_PLATFORM_ARG[@]}; do
   for ARCH in ${OS_ARCH_ARG[@]}; do
     echo "Building binary for $OS/$ARCH..."