diff options
| author | Michal Strehovský <MichalStrehovsky@users.noreply.github.com> | 2017-04-26 06:36:49 +0300 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2017-04-26 06:36:49 +0300 |
| commit | 165a55360055286c2cd0177b24ccbd9f7797c183 (patch) | |
| tree | 3b7b08ae0149b5d0228de5a740a5581614488cc3 /src/Test.CoreLib | |
| parent | e69c7e5a46de665f2251fe095c8724d9e3460c6b (diff) | |
Centralize build defines (#3431)
The way we were setting common defines (such as `AMD64`, `BIT64`, `ARM`)
was extremely fragile and invited partial fixes such as #3414 and #3424.
This really needs to be centralized.
Diffstat (limited to 'src/Test.CoreLib')
| -rw-r--r-- | src/Test.CoreLib/src/Test.CoreLib.csproj | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/src/Test.CoreLib/src/Test.CoreLib.csproj b/src/Test.CoreLib/src/Test.CoreLib.csproj index e4f95c3ba..6d56898e1 100644 --- a/src/Test.CoreLib/src/Test.CoreLib.csproj +++ b/src/Test.CoreLib/src/Test.CoreLib.csproj @@ -25,23 +25,14 @@ <PropertyGroup Condition="'$(Configuration)' == 'Debug'"> <DefineConstants>FEATURE_GC_STRESS;$(DefineConstants)</DefineConstants> </PropertyGroup> - <PropertyGroup Condition="'$(Platform)' == 'x64'"> - <DefineConstants>AMD64;BIT64;$(DefineConstants)</DefineConstants> - </PropertyGroup> - <PropertyGroup Condition="'$(Platform)' == 'x86'"> - <DefineConstants>X86;$(DefineConstants)</DefineConstants> - </PropertyGroup> <PropertyGroup Condition="'$(Platform)' == 'arm'"> - <DefineConstants>ARM;FEATURE_64BIT_ALIGNMENT;$(DefineConstants)</DefineConstants> + <DefineConstants>FEATURE_64BIT_ALIGNMENT;$(DefineConstants)</DefineConstants> </PropertyGroup> - <PropertyGroup Condition="'$(Platform)' == 'arm64'"> - <DefineConstants>ARM64;BIT64;$(DefineConstants)</DefineConstants> + <PropertyGroup Condition="'$(Platform)' == 'armel'"> + <DefineConstants>FEATURE_64BIT_ALIGNMENT;$(DefineConstants)</DefineConstants> </PropertyGroup> <PropertyGroup> - <DefineConstants>CORERT;EETYPE_TYPE_MANAGER;$(DefineConstants)</DefineConstants> - </PropertyGroup> - <PropertyGroup Condition="'$(TargetsUnix)'=='true'"> - <DefineConstants>PLATFORM_UNIX;$(DefineConstants)</DefineConstants> + <DefineConstants>EETYPE_TYPE_MANAGER;$(DefineConstants)</DefineConstants> </PropertyGroup> <!-- For now, link Runtime.Base into Test.CoreLib until there is proper multifile build --> <PropertyGroup> @@ -50,6 +41,7 @@ <PropertyGroup Condition="'$(InPlaceRuntime)' == 'true'"> <DefineConstants>INPLACE_RUNTIME;$(DefineConstants)</DefineConstants> <DefineConstants Condition="'$(Platform)' == 'arm'">FEATURE_64BIT_ALIGNMENT;$(DefineConstants)</DefineConstants> + <DefineConstants Condition="'$(Platform)' == 'armel'">FEATURE_64BIT_ALIGNMENT;$(DefineConstants)</DefineConstants> </PropertyGroup> <ItemGroup Condition="'$(InPlaceRuntime)' == 'true'"> <Compile Include="..\..\Runtime.Base\src\System\Runtime\CachedInterfaceDispatch.cs"> |