Fixes.

- Enable @rpath support on OS X and silence the policy warning.
- Replace usage of uname -o, which is Linux-specific, with uname -s,
  which is not.
- Document the WITH_LLDB_{LIBS,INCLUDES} variables.
- Stringify a couple of arguments to find_{library,paths} and
  include_directories.
- Unstringify an argument to cmake in gen-buildsys-clang.sh.

1 files changed, 16 insertions, 9 deletions

diff --git a/build.sh b/build.sh
index bcc2aba42f..ce2c3e5746 100755
--- a/build.sh
+++ b/build.sh
@@ -88,15 +88,22 @@ echo "Commencing CoreCLR Repo build"
 # Obtain the location of the bash script to figure out whether the root of the repo is.
 __ProjectRoot="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 __BuildArch=x64
-# Use uname to determine what the OS is.  
-if [ $(uname -o | grep -i Linux) ]; then
-    __BuildOS=linux
-elif [ $(uname -s | grep -i Darwin) ]; then
-    __BuildOS=mac
-else
-    echo "Unsupported OS detected, assuming linux"
-    __BuildOS=linux
-fi
+# Use uname to determine what the OS is.
+OSName=$(uname -s)
+case $OSName in
+    Linux)
+        __BuildOS=linux
+        ;;
+
+    Darwin)
+        __BuildOS=mac
+        ;;
+
+    *)
+        echo "Unsupported OS $OSName detected, configuring as if for Linux"
+        __BuildOS=linux
+        ;;
+esac
 __MSBuildBuildArch=x64
 __BuildType=debug
 __CMakeArgs=DEBUG