提交 ad461c61 作者: Lars Gierth

Revert "Makefile, bin: Support multiple GOPATH components"

This reverts commit ff75bc03,
which broke building on windows. See ipfs/go-ipfs#2833.

License: MIT
Signed-off-by: 's avatarLars Gierth <larsg@systemli.org>
上级 868a1e36
...@@ -41,7 +41,7 @@ bin/gx-go-v%: ...@@ -41,7 +41,7 @@ bin/gx-go-v%:
gx_check: ${gx_bin} ${gx-go_bin} gx_check: ${gx_bin} ${gx-go_bin}
path_check: path_check:
@bin/check_go_path $(realpath $(shell pwd)) $(realpath $(addsuffix /src/github.com/ipfs/go-ipfs,$(subst :, ,$(GOPATH)))) @bin/check_go_path $(realpath $(shell pwd)) $(realpath $(GOPATH)/src/github.com/ipfs/go-ipfs)
deps: go_check gx_check path_check deps: go_check gx_check path_check
${gx_bin} --verbose install --global ${gx_bin} --verbose install --global
......
#!/bin/sh #!/bin/sh
PWD=$1 PWD=$1
EXPECTED=$2
if [ -z "$PWD" ]; then if [ -z "$PWD" ]; then
echo "must pass in your current working directory" echo "must pass in your current working directory"
...@@ -12,13 +13,8 @@ if [ -z "$GOPATH" ]; then ...@@ -12,13 +13,8 @@ if [ -z "$GOPATH" ]; then
exit 1 exit 1
fi fi
while [ ${#} -gt 1 ]; do if [ "$PWD" != "$EXPECTED" ]; then
if [ "$PWD" = "$2" ]; then echo "go-ipfs must be built from within your \$GOPATH directory."
exit 0 echo "expected '$EXPECTED' but got '$PWD'"
fi exit 1
shift fi
done
echo "go-ipfs must be built from within your \$GOPATH directory."
echo "expected within '$GOPATH' but got '$PWD'"
exit 1
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论