Skip to content

Commit

Permalink
Fix build tags with comma on muslc as well
Browse files Browse the repository at this point in the history
  • Loading branch information
ethanfrey committed Jun 24, 2020
1 parent ea9a1ae commit bb6e087
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
9 changes: 7 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -10,6 +10,11 @@ RUN apk add libusb-dev linux-headers
WORKDIR /code
COPY . /code

# try this one out
RUN BUILD_TAGS=muslc make view

RUN false

# download all deps
RUN go mod download
# TODO: how to use this instead of hardcoding GO_COSMWASM
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -60,7 +60,7 @@ endif
ldflags += $(LDFLAGS)
ldflags := $(strip $(ldflags))

BUILD_FLAGS := -tags $(build_tags_comma_sep) -ldflags '$(ldflags)' -trimpath
BUILD_FLAGS := -tags "$(build_tags_comma_sep)" -ldflags '$(ldflags)' -trimpath

# The below include contains the tools target.
include contrib/devtools/Makefile
Expand Down

0 comments on commit bb6e087

Please sign in to comment.