Make cross compile configurable.

.travis.yml

@@ -12,14 +12,18 @@ os:
   - osx
 
 env:
-  - TARGETS="check"
-  # - TARGETS="testsuite ES_HOST=elasticsearch-173"
-  - TARGETS="-C libbeat testsuite ES_HOST=elasticsearch-210"
-  - TARGETS="-C topbeat testsuite"
-  - TARGETS="-C filebeat testsuite"
-  - TARGETS="-C packetbeat testsuite"
-  - TARGETS="-C libbeat crosscompile"
-  - TARGETS="-C filebeat crosscompile"
+  matrix:
+    - TARGETS="check"
+    # - TARGETS="testsuite ES_HOST=elasticsearch-173"
+    - TARGETS="-C libbeat testsuite ES_HOST=elasticsearch-210"
+    - TARGETS="-C topbeat testsuite"
+    - TARGETS="-C filebeat testsuite"
+    - TARGETS="-C packetbeat testsuite"
+    - TARGETS="-C libbeat crosscompile"
+    - TARGETS="-C filebeat crosscompile"
+  global:
+    # Cross-compile for amd64 only to speed up testing.
+    - GOX_FLAGS="-arch amd64"
 
 matrix:
   exclude:

libbeat/scripts/Makefile

@@ -14,6 +14,7 @@ TIMEOUT?= 90
 BEATNAME?=libbeat
 TEST_ENVIRONMENT?=false
 SYSTEM_TESTS?=false
+GOX_OS?=linux darwin windows solaris freebsd netbsd openbsd
 
 
 ### BUILDING ###
@@ -28,12 +29,13 @@ build: $(GOFILES)
 libbeat.test: $(GOFILES)
 	go test -c -covermode=atomic -coverpkg ./...
 
-# Cross-compile beat for the OS and architectures listed in
-# crosscompile.bash. The binaries are placed in the ./bin dir.
+# Cross-compile beat for the OS'es specified in GOX_OS variable.
+# The binaries are placed in the build/bin directory.
 .PHONY: crosscompile
 crosscompile: $(GOFILES)
+	go get github.com/mitchellh/gox
 	mkdir -p ${BUILD_DIR}/bin
-	source ../libbeat/scripts/crosscompile.bash; OUT='${BUILD_DIR}/bin' go-build-all
+	gox -output="${BUILD_DIR}/bin/{{.Dir}}-{{.OS}}-{{.Arch}}" -os="${GOX_OS}" ${GOX_FLAGS}
 
 # Checks project and source code if everything is according to standard
 .PHONY: check

topbeat/Makefile

@@ -1,6 +1,9 @@
 BEATNAME=topbeat
 SYSTEM_TESTS=true
 
+# Only crosscompile for linux because other OS'es use cgo.
+GOX_OS=linux
+
 include ../libbeat/scripts/Makefile
 
 .PHONY: install-cfg

winlogbeat/Makefile

@@ -1,6 +1,7 @@
 BEATNAME=winlogbeat
 SYSTEM_TESTS=true
 TEST_ENVIRONMENT=false
+GOX_OS=windows
 
 include ../libbeat/scripts/Makefile