diff options
| author | Ludovic Henry <luhenry@microsoft.com> | 2018-06-14 03:39:56 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-14 03:39:56 +0300 |
| commit | 927ae9570216b7fa21d7bc1900d2b1751f20b4f3 (patch) | |
| tree | 4d79d3c6214ee7d31b5b82ffbb6b3075f6563ed2 /msvc/scripts | |
| parent | 049af74f60707792b41e1f1770f963e4fed2a3f7 (diff) | |
[build] Rename darwin platform to macos + Add `unix` host platform (#9022)
* [mcs] Rename darwin paltform to macos
Darwin is common to both macOS and iOS/tvOS/watchOS, while we use the darwin platform only for macOS.
* [mcs] Add Unix platform for other Unixes than Linux
* [mcs] Remove PLATFORMS from xammac_net_4_5 since it only make sense on macos
* [bcl] Bump corlib version
* [csproj] Update project files
Diffstat (limited to 'msvc/scripts')
| -rw-r--r-- | msvc/scripts/genproj.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/msvc/scripts/genproj.cs b/msvc/scripts/genproj.cs index 741dff4e06e..874ac81b8b1 100644 --- a/msvc/scripts/genproj.cs +++ b/msvc/scripts/genproj.cs @@ -1048,11 +1048,12 @@ class MsbuildGenerator { intermediate_output_dir = "obj\\Debug\\" + library; } - if (build_output_dir.Contains ("-linux") || build_output_dir.Contains ("-darwin") || build_output_dir.Contains ("-win32")) + if (build_output_dir.Contains ("-linux") || build_output_dir.Contains ("-macos") || build_output_dir.Contains ("-win32") || build_output_dir.Contains ("-unix")) build_output_dir = build_output_dir .Replace ("-linux", "-$(HostPlatform)") - .Replace ("-darwin", "-$(HostPlatform)") - .Replace ("-win32", "-$(HostPlatform)"); + .Replace ("-macos", "-$(HostPlatform)") + .Replace ("-win32", "-$(HostPlatform)") + .Replace ("-unix", "-$(HostPlatform)"); bool basic_or_build = (library.Contains ("-basic") || library.Contains ("-build")); |