Fix building with Mono on OS X

ben · ben · commit 94aeb13043c3 · 2013-11-11T08:42:19.000-08:00
diff --git a/build.libgit2sharp.sh b/build.libgit2sharp.sh
@@ -1,27 +1,28 @@
 #!/bin/bash
 
-PREVIOUS_LD=$LD_LIBRARY_PATH
-
 LIBGIT2SHA=`cat ./LibGit2Sharp/libgit2_hash.txt`
 SHORTSHA=${LIBGIT2SHA:0:7}
 
-rm -rf cmake-build
-mkdir cmake-build && cd cmake-build
+rm -rf libgit2/build
+mkdir libgit2/build
+pushd libgit2/build
+export _BINPATH=`pwd`
 
-cmake -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo -DTHREADSAFE:BOOL=ON -DBUILD_CLAR:BOOL=OFF -DCMAKE_INSTALL_PREFIX=./libgit2-bin -DLIBGIT2_FILENAME=git2-$SHORTSHA ../libgit2
-cmake --build . --target install
+cmake -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
+      -DTHREADSAFE:BOOL=ON \
+      -DBUILD_CLAR:BOOL=OFF \
+      -DLIBGIT2_FILENAME=git2-$SHORTSHA \
+      -DCMAKE_OSX_ARCHITECTURES="i386;x86_64" \
+      ..
+cmake --build .
 
-LD_LIBRARY_PATH=$PWD/libgit2-bin/lib:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=$_BINPATH:$LD_LIBRARY_PATH
+export DYLD_LIBRARY_PATH=$_BINPATH:$DYLD_LIBRARY_PATH
 
-cd ..
+popd
 
+echo $DYLD_LIBRARY_PATH
 echo $LD_LIBRARY_PATH
 xbuild CI-build.msbuild /t:Deploy
 
-EXIT_CODE=$?
-
-LD_LIBRARY_PATH=$PREVIOUS_LD
-export LD_LIBRARY_PATH
-
-exit $EXIT_CODE
+exit $?
