drgrove
/
distrust-stack
forked from public/stack
1
0
Fork 0
Code Pull Requests Activity

Makefile: fix after rebase

This commit is contained in:
RyanSquared 2023-05-06 16:40:40 -04:00
parent 6fb97a7b8e
commit 048f29c9f1
Signed by untrusted user who does not match committer: ryan
GPG Key ID: 8E401478A3FBEF72
1 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile
View File

@ -119,33 +119,15 @@ $(OUT_DIR)/terraform: $(FETCH_DIR)/terraform
-o /home/build/$@ \ -o /home/build/$@ \
") ")
<<<<<<< HEAD
$(OUT_DIR)/sops: $(FETCH_DIR)/sops
$(call toolchain," \
cd $(FETCH_DIR)/sops && \
export SSL_CERT_DIR=/etc/ssl/certs && \
export GOCACHE=/home/build/$(CACHE_DIR) && \
export GOPATH=/home/build/$(CACHE_DIR) && \
export CGO_ENABLED=0 && \
=======
$(FETCH_DIR)/sops:
$(call git_clone,$@,$(SOPS_REPO),$(SOPS_REF))
$(OUT_DIR)/sops: $(FETCH_DIR)/sops $(OUT_DIR)/sops: $(FETCH_DIR)/sops
$(call toolchain," \ $(call toolchain," \
cd $(FETCH_DIR)/sops && \ cd $(FETCH_DIR)/sops && \
export CGO_ENABLED=0 && \ export CGO_ENABLED=0 && \
export GOCACHE=/home/build/$(CACHE_DIR) && \ export GOCACHE=/home/build/$(CACHE_DIR) && \
export GOPATH=/home/build/$(CACHE_DIR) && \ export GOPATH=/home/build/$(CACHE_DIR) && \
>>>>>>> c8a6313 (Makefile: add sops)
go build \ go build \
-v \ -v \
-trimpath \ -trimpath \
-ldflags='-w -extldflags=-static' \ -ldflags='-w -extldflags=-static' \
<<<<<<< HEAD
-o /home/build/$@ \
go.mozilla.org/sops/v3/cmd/sops \
=======
-o /home/build/$@ $(SOPS_PKG) \ -o /home/build/$@ $(SOPS_PKG) \
>>>>>>> c8a6313 (Makefile: add sops)
") ")