Skip to content

Commit bcf3252

Browse files
authored
Merge pull request libgit2#445 from rmg/exclusive-pkg-config
static: use pkg-config exclusively when using it
2 parents b51a90c + b3256d9 commit bcf3252

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

git_static.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
package git
44

55
/*
6-
#cgo CFLAGS: -I${SRCDIR}/vendor/libgit2/include
7-
#cgo LDFLAGS: -L${SRCDIR}/vendor/libgit2/build/ -lgit2
8-
#cgo windows LDFLAGS: -lwinhttp
6+
#cgo windows CFLAGS: -I${SRCDIR}/vendor/libgit2/include
7+
#cgo windows LDFLAGS: -L${SRCDIR}/vendor/libgit2/build/ -lgit2 -lwinhttp
98
#cgo !windows pkg-config: --static ${SRCDIR}/vendor/libgit2/build/libgit2.pc
109
#include <git2.h>
1110

script/build-libgit2-static.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ cmake -DTHREADSAFE=ON \
1616
-DCMAKE_INSTALL_PREFIX=../install \
1717
.. &&
1818

19-
cmake --build .
19+
cmake --build . --target install

0 commit comments

Comments
 (0)