Skip to content

Commit

Permalink
Fix build on RHEL 7 (dotnet#1718)
Browse files Browse the repository at this point in the history
- Add detection for rhel.7-x64 runtime id to cibuild.sh
- Add rhel.7-x64 runtime ids to project.json's with runtime sections

Tested on RHEL 7.3
  • Loading branch information
omajid authored and AndyGerlicher committed Feb 22, 2017
1 parent 90dd899 commit 3bf6f95
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 0 deletions.
4 changes: 4 additions & 0 deletions cibuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@ get_current_linux_name() {
echo "centos"
return 0
elif [ "$(cat /etc/*-release | grep -cim1 rhel)" -eq 1 ]; then
if [ "$(cat /etc/os-release | grep -cim1 'VERSION_ID="7\.')" -eq 1 ]; then
echo "rhel.7"
return 0
fi
echo "rhel"
return 0
elif [ "$(cat /etc/*-release | grep -cim1 debian)" -eq 1 ]; then
Expand Down
1 change: 1 addition & 0 deletions targets/roslyn/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"win7-x86": {},
"win7-x64": {},
"osx.10.10-x64": {},
"rhel.7-x64": {},
"ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {}
},
Expand Down
1 change: 1 addition & 0 deletions targets/runtimeDependencies/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"win7-x86": {},
"win7-x64": {},
"osx.10.10-x64": {},
"rhel.7-x64": {},
"ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {}
},
Expand Down

0 comments on commit 3bf6f95

Please sign in to comment.