diff options
| author | Marius Ungureanu <marius.ungureanu@xamarin.com> | 2016-02-15 23:34:09 +0300 |
|---|---|---|
| committer | Marius Ungureanu <marius.ungureanu@xamarin.com> | 2016-02-15 23:34:09 +0300 |
| commit | d8b2acad2fdb0f6cc8823f8dc969576f1962f6a2 (patch) | |
| tree | 4492e103b3a7509eb299ac98a2e66cd39b1f4060 | |
| parent | 0b24ddc591811fd3670b83073dde44595c0c1cb5 (diff) | |
Revert "bump the world and enable NSEC checks."xs-5.10-v2cycle7
This reverts commit 7618d373ce667010cd00b133ee1c14e1e6a57b98.
| -rw-r--r-- | build.libgit2.ps1 | 2 | ||||
| -rwxr-xr-x | build.libgit2.sh | 1 | ||||
| m--------- | external/libgit2 | 0 |
3 files changed, 1 insertions, 2 deletions
diff --git a/build.libgit2.ps1 b/build.libgit2.ps1 index 5586254..2f1bca8 100644 --- a/build.libgit2.ps1 +++ b/build.libgit2.ps1 @@ -114,7 +114,7 @@ try { Run-Command { & remove-item build -recurse -force } Run-Command { & mkdir build } cd build - Run-Command -Fatal { & $cmake -G "Visual Studio $vs" -D ENABLE_TRACE=ON -D "LIBGIT2_FILENAME=$binaryFilename" -DUSE_NSEC=ON -DSTDCALL=ON -D "EMBED_SSH_PATH=../libssh2" -DBUILD_CLAR:BOOL=OFF \ .. } + Run-Command -Fatal { & $cmake -G "Visual Studio $vs" -D ENABLE_TRACE=ON -D "LIBGIT2_FILENAME=$binaryFilename" -DSTDCALL=ON -D "EMBED_SSH_PATH=../libssh2" -DBUILD_CLAR:BOOL=OFF \ .. } Run-Command -Fatal { & $cmake --build . --config $configuration } cd $configuration Assert-Consistent-Naming "$binaryFilename.dll" "*.dll" diff --git a/build.libgit2.sh b/build.libgit2.sh index ad6f25f..81feeba 100755 --- a/build.libgit2.sh +++ b/build.libgit2.sh @@ -85,7 +85,6 @@ then -DLIBSSH2_LIBRARY_DIRS="$CURDIR/external/libssh2/build/src" \ -DSSH_LIBRARIES="ssh2" \ -DHAVE_LIBSSH2_MEMORY_CREDENTIALS=TRUE \ - -DUSE_NSEC=ON \ .. else cmake -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \ diff --git a/external/libgit2 b/external/libgit2 -Subproject ab8e88a96b5b9e1a59a6f8742fe0136b1315871 +Subproject e8b8948f5a07cd813ccad7b97490b7f040d364c |