diff options
| author | Carlos Martín Nieto <[email protected]> | 2014-12-30 10:09:54 +0000 |
|---|---|---|
| committer | Carlos Martín Nieto <[email protected]> | 2014-12-30 10:09:54 +0000 |
| commit | db3754ce8db412a7fd82cca2d0f91ddbcf90b475 (patch) | |
| tree | 53b2f23af2a1781990a43e5202b7595ca08cc1f0 /script | |
| parent | 42414248f9d4fb77cc4b48447364a6dcb1624607 (diff) | |
| parent | 8f6e13bd08d2f37027d34c0f379a79a6c5263e8a (diff) | |
Merge pull request #159 from libgit2/cgo-directives
Make the cgo tool do more linking work
Diffstat (limited to 'script')
| -rwxr-xr-x | script/build-libgit2-static.sh | 4 | ||||
| -rwxr-xr-x | script/with-static.sh | 12 |
2 files changed, 2 insertions, 14 deletions
diff --git a/script/build-libgit2-static.sh b/script/build-libgit2-static.sh index 5723721..0a6c39f 100755 --- a/script/build-libgit2-static.sh +++ b/script/build-libgit2-static.sh @@ -4,7 +4,7 @@ set -ex VENDORED_PATH=vendor/libgit2 -cd $VENDORED_PATH && +cd "$VENDORED_PATH" && mkdir -p install/lib && mkdir -p build && cd build && @@ -13,7 +13,7 @@ cmake -DTHREADSAFE=ON \ -DBUILD_SHARED_LIBS=OFF \ -DCMAKE_C_FLAGS=-fPIC \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ - -DCMAKE_INSTALL_PREFIX=../install \ + -DCMAKE_INSTALL_PREFIX=. \ .. && cmake --build . diff --git a/script/with-static.sh b/script/with-static.sh deleted file mode 100755 index 3f60e31..0000000 --- a/script/with-static.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -set -ex - -export BUILD="$PWD/vendor/libgit2/build" -export PCFILE="$BUILD/libgit2.pc" - -FLAGS=$(pkg-config --static --libs $PCFILE) || exit 1 -export CGO_LDFLAGS="$BUILD/libgit2.a -L$BUILD ${FLAGS}" -export CGO_CFLAGS="-I$PWD/vendor/libgit2/include" - -$@ |