Skip to content

Commit

Permalink
Fix build tags and add bsd back to x-compile
Browse files Browse the repository at this point in the history
The build tags added in elastic#13509 didn't have an effect because only line comments can precede build tags.

This also adds back cross-compilation for freebsd and netbsd that was disabled due to Docker compilation issues. Closes elastic#13400
  • Loading branch information
andrewkroh committed Sep 12, 2019
1 parent 24c1e59 commit 9f0a243
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion libbeat/scripts/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ TEST_ENVIRONMENT?=false ## @testing if true, "make testsuite" runs integration t
SYSTEM_TESTS?=false ## @testing if true, "make test" and "make testsuite" run unit tests and system tests
STRESS_TESTS?=false ## @testing if true, "make test" and "make testsuite" run also run the stress tests
STRESS_TEST_OPTIONS?=-timeout=20m -race -v
GOX_OS?=linux darwin windows openbsd ## @Building List of all OS to be supported by "make crosscompile".
GOX_OS?=linux darwin windows freebsd netbsd openbsd ## @Building List of all OS to be supported by "make crosscompile".
GOX_OSARCH?=!darwin/arm !darwin/arm64 !darwin/386 ## @building Space separated list of GOOS/GOARCH pairs to build by "make crosscompile".
GOX_FLAGS?= ## @building Additional flags to append to the gox command used by "make crosscompile".
# XXX: Should be switched back to `snapshot` once the Elasticsearch
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ TEST_ENVIRONMENT?=true
ES_BEATS?=..

# Metricbeat can only be cross-compiled on platforms not requiring CGO.
GOX_OS=linux windows
GOX_OS=netbsd linux windows
GOX_FLAGS=-arch="amd64 386 arm ppc64 ppc64le"

DOCS_BRANCH=$(shell grep doc-branch ../libbeat/docs/version.asciidoc | cut -c 14-)
Expand Down
4 changes: 2 additions & 2 deletions metricbeat/include/list_docker.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions script/generate_imports.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
// Code generated by 'make imports' - DO NOT EDIT.
/*
{buildtags}/*
{comment}
*/
{buildtags}package {package}
package {package}
import (
{imports}
Expand Down

0 comments on commit 9f0a243

Please sign in to comment.