From a4cad5d4d3a7bbb9fa98b8aa3dc8167328065ea7 Mon Sep 17 00:00:00 2001
From: Aaron Robinson <arobins@microsoft.com>
Date: Fri, 15 Feb 2019 21:28:50 -0800
Subject: [PATCH] Set the 'PLATFORM_OSX' constant during OSX build (#22639)

* Set the 'PLATFORM_OSX' constant during OSX build

* Remove PLATFORM_OSX define from SPCL
---
 clr.defines.targets                                      | 1 +
 src/System.Private.CoreLib/System.Private.CoreLib.csproj | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/clr.defines.targets b/clr.defines.targets
index 81ee899..7a81fd8 100644
--- a/clr.defines.targets
+++ b/clr.defines.targets
@@ -30,5 +30,6 @@
 
         <DefineConstants Condition="'$(TargetsUnix)' == 'true'">$(DefineConstants);PLATFORM_UNIX</DefineConstants>
         <DefineConstants Condition="'$(TargetsWindows)' == 'true'">$(DefineConstants);PLATFORM_WINDOWS</DefineConstants>
+        <DefineConstants Condition="'$(TargetsOSX)' == 'true'">$(DefineConstants);PLATFORM_OSX</DefineConstants>
     </PropertyGroup>
 </Project>
diff --git a/src/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/System.Private.CoreLib/System.Private.CoreLib.csproj
index a4c2a44..3719202 100644
--- a/src/System.Private.CoreLib/System.Private.CoreLib.csproj
+++ b/src/System.Private.CoreLib/System.Private.CoreLib.csproj
@@ -83,9 +83,6 @@
   <PropertyGroup Condition="'$(OsEnvironment)' == 'Unix'">
     <DebugType>portable</DebugType>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetsOSX)' == 'true'">
-    <DefineConstants>PLATFORM_OSX;$(DefineConstants)</DefineConstants>
-  </PropertyGroup>
   <!-- Assembly attributes -->
   <PropertyGroup>
     <AssemblyName>System.Private.CoreLib</AssemblyName>
-- 
2.7.4