Fix FreeBSD build
authorTom Deseyn <tom.deseyn@gmail.com>
Wed, 7 Jun 2017 08:55:08 +0000 (10:55 +0200)
committerTom Deseyn <tom.deseyn@gmail.com>
Wed, 7 Jun 2017 08:55:08 +0000 (10:55 +0200)
build-test.sh
build.sh

index ee296a3..0ebee80 100755 (executable)
@@ -47,15 +47,21 @@ isMSBuildOnNETCoreSupported()
         return
     fi
 
-    __isMSBuildOnNETCoreSupported=1
-    UNSUPPORTED_RIDS=("*-arm" "*-arm64" "*-x86" "debian.9-x64" "ubuntu.17.04-x64")
-    for UNSUPPORTED_RID in "${UNSUPPORTED_RIDS[@]}"
-    do
-        if [[ "$__HostDistroRid" == $UNSUPPORTED_RID ]]; then
-            __isMSBuildOnNETCoreSupported=0
-            break
+    if [ "$__HostArch" == "x64" ]; then
+        if [ "$__HostOS" == "Linux" ]; then
+            __isMSBuildOnNETCoreSupported=1
+            UNSUPPORTED_RIDS=("debian.9-x64" "ubuntu.17.04-x64")
+            for UNSUPPORTED_RID in "${UNSUPPORTED_RIDS[@]}"
+            do
+                if [ "$__HostDistroRid" == "$UNSUPPORTED_RID" ]; then
+                    __isMSBuildOnNETCoreSupported=0
+                    break
+                fi
+            done
+        elif [ "$__HostOS" == "OSX" ]; then
+            __isMSBuildOnNETCoreSupported=1
         fi
-    done
+    fi
 }
 
 build_Tests()
index 0846820..43241d2 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -384,15 +384,21 @@ isMSBuildOnNETCoreSupported()
         return
     fi
 
-    __isMSBuildOnNETCoreSupported=1
-    UNSUPPORTED_RIDS=("*-arm" "*-arm64" "*-x86" "debian.9-x64" "ubuntu.17.04-x64")
-    for UNSUPPORTED_RID in "${UNSUPPORTED_RIDS[@]}"
-    do
-        if [[ "$__HostDistroRid" == $UNSUPPORTED_RID ]]; then
-            __isMSBuildOnNETCoreSupported=0
-            break
+    if [ "$__HostArch" == "x64" ]; then
+        if [ "$__HostOS" == "Linux" ]; then
+            __isMSBuildOnNETCoreSupported=1
+            UNSUPPORTED_RIDS=("debian.9-x64" "ubuntu.17.04-x64")
+            for UNSUPPORTED_RID in "${UNSUPPORTED_RIDS[@]}"
+            do
+                if [ "$__HostDistroRid" == "$UNSUPPORTED_RID" ]; then
+                    __isMSBuildOnNETCoreSupported=0
+                    break
+                fi
+            done
+        elif [ "$__HostOS" == "OSX" ]; then
+            __isMSBuildOnNETCoreSupported=1
         fi
-    done
+    fi
 }