Merge pull request #152 from CosmWasm/improve-makefile

Convert -tags argument to comma separated list
notional-labs · Jun 24, 2020 · 3d8a7a8 · 3d8a7a8
2 parents 5cd9434 + f0eb780
commit 3d8a7a8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -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

diff --git a/Makefile b/Makefile
@@ -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