diff options
| author | Matt Ellis <matell@microsoft.com> | 2017-06-07 23:53:49 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-07 23:53:49 -0700 |
| commit | 5d2a54449d6b9d8fecb788e741654d7dbd992a87 (patch) | |
| tree | 4fc41fe7c926abbc34831eb756cb32a7c08e1ab8 /build.sh | |
| parent | aa96acbf53bfcfcc12fb9c0a9c3ded23f6fd63ed (diff) | |
| parent | 16ef19c51b19907e589155e8f9d24b3247c8745b (diff) | |
| download | coreclr-5d2a54449d6b9d8fecb788e741654d7dbd992a87.tar.gz coreclr-5d2a54449d6b9d8fecb788e741654d7dbd992a87.tar.bz2 coreclr-5d2a54449d6b9d8fecb788e741654d7dbd992a87.zip | |
Merge pull request #12102 from tmds/any-linux
build.sh: fall back to portable Linux when Linux host has unknown rid
Diffstat (limited to 'build.sh')
| -rwxr-xr-x | build.sh | 47 |
1 files changed, 14 insertions, 33 deletions
@@ -381,49 +381,30 @@ build_cross_arch_component() isMSBuildOnNETCoreSupported() { - # This needs to be updated alongwith corresponding changes to netci.groovy. __isMSBuildOnNETCoreSupported=$__msbuildonunsupportedplatform + if [ $__isMSBuildOnNETCoreSupported == 1 ]; then + return + fi + if [ "$__HostArch" == "x64" ]; then if [ "$__HostOS" == "Linux" ]; then - case "$__HostDistroRid" in - "centos.7-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "debian.8-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "fedora.24-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "fedora.25-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "opensuse.42.1-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "rhel.7"*"-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "ubuntu.14.04-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "ubuntu.16.04-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "ubuntu.16.10-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "alpine.3.4.3-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - esac + __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 fi } + build_CoreLib_ni() { if [ $__SkipCoreCLR == 0 -a -e $__BinDir/crossgen ]; then |