mleku/wasmd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #152 from CosmWasm/improve-makefile

Browse Source 
Convert -tags argument to comma separated list
This commit is contained in:
Simon Warta
2020-06-24 14:02:32 +02:00
committed by GitHub
parent 5cd9434166 f0eb7807cc
commit 3d8a7a8726
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@@ -1,5 +1,5 @@
# docker build . -t cosmwasm/wasm:latest
# docker run --rm -it cosmwasm/wasm:latest /bin/sh
# docker build . -t cosmwasm/wasmd:latest
# docker run --rm -it cosmwasm/wasmd:latest /bin/sh
FROM cosmwasm/go-ext-builder:0.8.2-alpine AS builder
RUN apk add git

8
Makefile
View File

@@ -40,10 +40,10 @@ endif
build_tags += $(BUILD_TAGS)
build_tags := $(strip $(build_tags))
whitespace :=
whitespace += $(whitespace)
empty :=
space := $(empty) $(empty)
comma := ,
build_tags_comma_sep := $(subst $(whitespace),$(comma),$(build_tags))
build_tags_comma_sep := $(subst $(space),$(comma),$(build_tags))
# process linker flags
@@ -60,7 +60,7 @@ endif
ldflags += $(LDFLAGS)
ldflags := $(strip $(ldflags))
BUILD_FLAGS := -tags "$(build_tags)" -ldflags '$(ldflags)' -trimpath
BUILD_FLAGS := -tags $(build_tags_comma_sep) -ldflags '$(ldflags)' -trimpath
# The below include contains the tools target.
include contrib/devtools/Makefile