From: Klas Lindfors <klas@yubico.com>
Date: Thu, 20 Sep 2012 12:15:02 +0000 (+0200)
Subject: try to give CC later
X-Git-Tag: v1.8.0~9
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf99d14086eb581205e210922b064f6302ef849a;p=yubikey-personalization

try to give CC later
---

diff --git a/.travis.yml b/.travis.yml
index 0c5673a..16ed26f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,5 +11,5 @@ before_install:
   - sudo apt-get install -qq libyubikey-dev $EXTRA
 matrix:
   include:
-    - compiler: i586-mingw32msvc-gcc
+    - compiler: gcc
       env: LIBUSB=windows EXTRA=wine
diff --git a/ykpers4win.mk b/ykpers4win.mk
index 5046da4..436c263 100644
--- a/ykpers4win.mk
+++ b/ykpers4win.mk
@@ -69,7 +69,7 @@ ykpers4win64:
 	$(MAKE) -f ykpers4win.mk ykpers4win ARCH=64 HOST=x86_64-w64-mingw32 CHECK=check
 
 ykpers4win32mingw32:
-	CFLAGS=-I/usr/i586-mingw32msvc/include/ddk/ $(MAKE) -f ykpers4win.mk ykpers4win ARCH=32 HOST=i586-mingw32msvc CHECK=check
+	$(MAKE) -f ykpers4win.mk ykpers4win ARCH=32 HOST=i586-mingw32msvc CHECK=check CC=i586-mingw32msvc-gcc CFLAGS=-I/usr/i586-mingw32msvc/include/ddk/
 
 upload-ykpers4win:
 	gpg --detach-sign --default-key $(PGPKEYID) \