diff options
| author | Carlos MartÃn Nieto <[email protected]> | 2019-01-04 12:18:20 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-01-04 12:18:20 +0000 |
| commit | bcf325244c4bfba5a722d1c9269836a3e83ecc73 (patch) | |
| tree | 7e33d8a0d7bcaa7fa0365e55c71fc42ccd5a5fab | |
| parent | b51a90c13329109db0c9ce2303ddf5ad08b3fe5b (diff) | |
| parent | b3256d9058aa93176190cb69f73afb72f0730100 (diff) | |
Merge pull request #445 from rmg/exclusive-pkg-config
static: use pkg-config exclusively when using it
| -rw-r--r-- | git_static.go | 5 | ||||
| -rwxr-xr-x | script/build-libgit2-static.sh | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/git_static.go b/git_static.go index 6303734..243669f 100644 --- a/git_static.go +++ b/git_static.go @@ -3,9 +3,8 @@ package git /* -#cgo CFLAGS: -I${SRCDIR}/vendor/libgit2/include -#cgo LDFLAGS: -L${SRCDIR}/vendor/libgit2/build/ -lgit2 -#cgo windows LDFLAGS: -lwinhttp +#cgo windows CFLAGS: -I${SRCDIR}/vendor/libgit2/include +#cgo windows LDFLAGS: -L${SRCDIR}/vendor/libgit2/build/ -lgit2 -lwinhttp #cgo !windows pkg-config: --static ${SRCDIR}/vendor/libgit2/build/libgit2.pc #include <git2.h> diff --git a/script/build-libgit2-static.sh b/script/build-libgit2-static.sh index 5723721..1568ece 100755 --- a/script/build-libgit2-static.sh +++ b/script/build-libgit2-static.sh @@ -16,4 +16,4 @@ cmake -DTHREADSAFE=ON \ -DCMAKE_INSTALL_PREFIX=../install \ .. && -cmake --build . +cmake --build . --target install |