From d20b67f92826177e797f1477a51bb8961e46de32 Mon Sep 17 00:00:00 2001 From: Max Risuhin Date: Sat, 22 Dec 2018 14:35:40 +0200 Subject: [PATCH] cross-compile amd64 on linux --- .travis.yml | 4 ++-- Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 496269b..255ccda 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ matrix: go_import_path: github.com/liamg/aminal before_install: - if [[ $TRAVIS_OS_NAME == 'linux' ]]; then sudo apt-get install -y xorg-dev libgl1-mesa-dev - gcc-multilib gcc-mingw-w64 && go get github.com/mitchellh/gox; fi + gcc-multilib gcc-mingw-w64-x86-64 && go get github.com/mitchellh/gox; fi script: - make test - if [[ $TRAVIS_OS_NAME == 'osx' ]]; then make build-darwin-native; fi @@ -30,7 +30,7 @@ deploy: file: - bin/darwin/aminal-darwin-amd64 - bin/linux/aminal-linux-amd64 - - bin/windows/aminal-windows-386.exe + - bin/windows/aminal-windows-amd64.exe on: repo: jumptrading/aminal tags: true diff --git a/Makefile b/Makefile index 5798005..df8f80a 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ build-linux: .PHONY: windows-cross-compile windows-cross-compile: mkdir -p bin/windows - GOOS=windows GOARCH=386 CGO_ENABLED=1 CXX=i686-w64-mingw32-g++ CC=i686-w64-mingw32-gcc go build -o bin/windows/${BINARY}-windows-386.exe -ldflags "-X github.com/liamg/aminal/version.Version=${TRAVIS_TAG}" + GOOS=windows GOARCH=amd64 CGO_ENABLED=1 CXX=x86_64-w64-mingw32-g++ CC=x86_64-w64-mingw32-gcc go build -o bin/windows/${BINARY}-windows-amd64.exe -ldflags "-X github.com/liamg/aminal/version.Version=${TRAVIS_TAG}" .PHONY: build-windows build-windows: