Created
January 25, 2018 22:56
-
-
Save jazzdan/adfa96b4118756587bf88336dfe4dd7f to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/rules/go_build_plugin.sh b/rules/go_build_plugin.sh | |
index c981f9b4..58b359fd 100755 | |
--- a/rules/go_build_plugin.sh | |
+++ b/rules/go_build_plugin.sh | |
@@ -20,6 +20,28 @@ fi | |
export GOPATH=$(pwd) | |
DEPS=$(go list -f '{{.ImportPath}}{{range .Deps}} | |
{{.}}{{end}}' "$SHARD_PACKAGE" | sed -e 's!$!/*!' | sort | uniq) | |
+NEWLINE=$'\n' | |
+DEPS+="$NEWLINE" | |
+DEPS+="github.com/cockroachdb/cockroach/c-deps/libroach/include/*" | |
+DEPS+="$NEWLINE" | |
+DEPS+="../native/x86_64-apple-darwin17.3.0/libroach/*" | |
+ | |
+DEPS+="$NEWLINE" | |
+DEPS+="../native/x86_64-apple-darwin17.3.0/cryptopp/*" | |
+ | |
+DEPS+="$NEWLINE" | |
+DEPS+="../native/x86_64-apple-darwin17.3.0/jemalloc/lib/*" | |
+ | |
+DEPS+="$NEWLINE" | |
+DEPS+="github.com/cockroachdb/cockroach/c-deps/protobuf/*" | |
+DEPS+="$NEWLINE" | |
+DEPS+="../native/x86_64-apple-darwin17.3.0/protobuf/*" | |
+ | |
+DEPS+="$NEWLINE" | |
+DEPS+="../native/x86_64-apple-darwin17.3.0/rocksdb/*" | |
+ | |
+DEPS+="$NEWLINE" | |
+DEPS+="../native/x86_64-apple-darwin17.3.0/snappy/*" | |
# Filter out the built-in imports | |
IMPORTS=$(grep -e "[.]" <<< "$DEPS" || echo "") | |
@@ -46,7 +68,7 @@ PATTERNS=$(echo "$ALL_DIRS" | grep -Ev "^$" | jq -R '[.]' | jq -s 'add') | |
cat <<JSON | |
{ | |
"deps": $PATTERNS, | |
- "argv": ["bash", "-c", | |
+ "argv": ["bash", "-c", | |
"export GOPATH=\`pwd\`; set -ex -o pipefail; go install $SHARD_PACKAGE 2>&1 | sed \"s!$ROOT/!\$WMROOT/!\" 1>&2"], | |
"artifacts": [{"path": "pkg"}], | |
"snapshot": {"matcher": {"patterns": ["bin/$BIN_NAME"]}} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment