Merge branch 'next'
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 8eb5872..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "vendor/libgit2"]
- path = vendor/libgit2
- url = https://github.com/libgit2/libgit2
diff --git a/Makefile b/Makefile
index 3040857..9c42283 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,8 @@
default: test
-build-libgit2:
- ./script/build-libgit2-static.sh
-
-test: build-libgit2
+test:
go run script/check-MakeGitError-thread-lock.go
- ./script/with-static.sh go test ./...
+ go test ./...
-install: build-libgit2
- ./script/with-static.sh go install ./...
+install:
+ go install ./...
diff --git a/git.go b/git.go
index 2b2a909..45b01d5 100644
--- a/git.go
+++ b/git.go
@@ -3,6 +3,7 @@
/*
#include <git2.h>
#include <git2/sys/openssl.h>
+#cgo pkg-config: libgit2
*/
import "C"
import (
diff --git a/vendor/libgit2 b/vendor/libgit2
deleted file mode 160000
index 785d8c4..0000000
--- a/vendor/libgit2
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 785d8c48ea8725691da3c50e7dae8751523d4c30
