From 364cd0f3c66b3e92dad36fea2e19647fbae36aa1 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Thu, 14 Jan 2016 23:16:43 -0800 Subject: [PATCH] Update build for OS X compatibility Shared libraries are .dylib (not .so) so use a wildcard. Recent dotnet-cli builds will guess the correct runtime when not supplied. --- build.sh | 4 ++-- src/monad | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index 9e813ab11f1..df4dafb3ad8 100755 --- a/build.sh +++ b/build.sh @@ -20,7 +20,7 @@ mkdir -p $BIN/Modules cmake -DCMAKE_BUILD_TYPE=Debug . make -j ctest -V - cp src/libpsl-native.so $BIN + cp src/libpsl-native.* $BIN ) # Build registry stub (this should go away, again) @@ -33,7 +33,7 @@ mkdir -p $BIN/Modules # Publish PowerShell ( cd src/Microsoft.PowerShell.Linux.Host - dotnet publish --framework dnxcore50 --runtime ubuntu.14.04-x64 --output $BIN + dotnet publish --framework dnxcore50 --output $BIN # Copy files that dotnet-publish does not currently deploy cp *_profile.ps1 $BIN ) diff --git a/src/monad b/src/monad index e08371d4a4e..2fdb6c10b64 160000 --- a/src/monad +++ b/src/monad @@ -1 +1 @@ -Subproject commit e08371d4a4e97bd64f47d2ce1361db32fd251a64 +Subproject commit 2fdb6c10b643b3efebcd6e5d503ff36c301feee9