Skip to content

Fix go export path #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sam-at-luther merged 1 commit into from
Jul 10, 2025
Merged

Fix go export path #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,10 +164,6 @@ pre-push:
.PHONY:
download: plugin

.PHONY: print-export-path
print-export-path:
@echo "export SUBSTRATEHCP_FILE=${SUBSTRATEHCP_FILE}"

${STATIC_PLUGINS_DUMMY}:
${MKDIR_P} $(dir $@)
./scripts/obtain-plugin.sh
Expand Down
2 changes: 2 additions & 0 deletions common.go.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ GO_PKG_VOLUME_DUMMY=${PROJECT_REL_DIR}/$(call DUMMY_TARGET,volume,${GO_PKG_VOLUM
GO_BUILD_TAGS ?= osusergo,netgo,cgo,timetzdata
GO_BUILD_FLAGS="-installsuffix ${GO_BUILD_TAGS} -tags ${GO_BUILD_TAGS} -buildvcs=false"

HOST_GO_ENV=SUBSTRATEHCP_FILE=${SUBSTRATEHCP_FILE}

.PHONY: default
default: docker-build
@
Expand Down
2 changes: 1 addition & 1 deletion common.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ else
ARCH_SUFFIX := $(ARCH)
endif

SUBSTRATE_PLUGIN_OS=${PROJECT_REL_DIR}/build/substratehcp-$(1)-${ARCH_SUFFIX}-${SUBSTRATE_VERSION}
SUBSTRATE_PLUGIN_OS=build/substratehcp-$(1)-${ARCH_SUFFIX}-${SUBSTRATE_VERSION}
SUBSTRATE_PLUGIN_LINUX=$(call SUBSTRATE_PLUGIN_OS,linux)
SUBSTRATE_PLUGIN_DARWIN=$(call SUBSTRATE_PLUGIN_OS,darwin)
SUBSTRATE_PLUGIN=${SUBSTRATE_PLUGIN_DARWIN} ${SUBSTRATE_PLUGIN_LINUX}
Expand Down