luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Fix default make target to build everything

This commit is contained in:
Matt Keeler 2018-06-27 14:25:49 -04:00
parent 579d6813f4
commit 1c7575f7cd
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
GNUmakefile
View File

@ -108,7 +108,8 @@ endif
# all builds binaries for all targets # all builds binaries for all targets
all: bin all: bin
bin: tools dev-build bin: tools
@$(SHELL) $(CURDIR)/build-support/scripts/build-local.sh
# dev creates binaries for testing locally - these are put into ./bin and $GOPATH # dev creates binaries for testing locally - these are put into ./bin and $GOPATH
dev: changelogfmt vendorfmt dev-build dev: changelogfmt vendorfmt dev-build

9
build-support/functions/20-build.sh
View File

@ -424,11 +424,18 @@ function build_consul_local {
do do
outdir="pkg.bin.new/${extra_dir}${os}_${arch}" outdir="pkg.bin.new/${extra_dir}${os}_${arch}"
osarch="${os}/${arch}" osarch="${os}/${arch}"
if test "${osarch}" == "darwin/arm" -o "${osarch}" == "darwin/arm64" if test "${osarch}" == "darwin/arm" -o "${osarch}" == "darwin/arm64" -o "${osarch}" == "freebsd/arm64" -o "${osarch}" == "windows/arm" -o "${osarch}" == "windows/arm64"
then then
continue continue
fi fi
if test "${os}" == "solaris" -a "${arch}" != "amd64"
then
continue
fi
echo "---> ${osarch}"
mkdir -p "${outdir}" mkdir -p "${outdir}"
CGO_ENABLED=0 GOOS=${os} GOARCH=${arch} go install -ldflags "${GOLDFLAGS}" -tags "${GOTAGS}" && cp "${MAIN_GOPATH}/bin/consul" "${outdir}/consul" CGO_ENABLED=0 GOOS=${os} GOARCH=${arch} go install -ldflags "${GOLDFLAGS}" -tags "${GOTAGS}" && cp "${MAIN_GOPATH}/bin/consul" "${outdir}/consul"
if test $? -ne 0 if test $? -ne 0