Fix default make target to build everything
This commit is contained in:
parent
579d6813f4
commit
1c7575f7cd
|
@ -108,7 +108,8 @@ endif
|
|||
# all builds binaries for all targets
|
||||
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: changelogfmt vendorfmt dev-build
|
||||
|
|
|
@ -424,11 +424,18 @@ function build_consul_local {
|
|||
do
|
||||
outdir="pkg.bin.new/${extra_dir}${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
|
||||
continue
|
||||
fi
|
||||
|
||||
if test "${os}" == "solaris" -a "${arch}" != "amd64"
|
||||
then
|
||||
continue
|
||||
fi
|
||||
|
||||
echo "---> ${osarch}"
|
||||
|
||||
mkdir -p "${outdir}"
|
||||
CGO_ENABLED=0 GOOS=${os} GOARCH=${arch} go install -ldflags "${GOLDFLAGS}" -tags "${GOTAGS}" && cp "${MAIN_GOPATH}/bin/consul" "${outdir}/consul"
|
||||
if test $? -ne 0
|
||||
|
|
Loading…
Reference in New Issue