diff options
| author | dotnet-bot <dotnet-bot@microsoft.com> | 2015-04-07 17:23:32 -0700 |
|---|---|---|
| committer | dotnet-bot <dotnet-bot@microsoft.com> | 2015-04-07 17:23:32 -0700 |
| commit | f1c0c7d95164abbbc4dfbd5bc312ef543256b0e0 (patch) | |
| tree | 7a7156b56e9b9283ae0668491157bf1526077a3a /src/dirs.proj | |
| parent | 1afe5ce4f45045d724a4e129df4b816655d486fb (diff) | |
| download | coreclr-f1c0c7d95164abbbc4dfbd5bc312ef543256b0e0.tar.gz coreclr-f1c0c7d95164abbbc4dfbd5bc312ef543256b0e0.tar.bz2 coreclr-f1c0c7d95164abbbc4dfbd5bc312ef543256b0e0.zip | |
Merge changes from parent branch
[tfs-changeset: 1448103]
Diffstat (limited to 'src/dirs.proj')
| -rw-r--r-- | src/dirs.proj | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/dirs.proj b/src/dirs.proj index 3599b7912b..ded6fb4267 100644 --- a/src/dirs.proj +++ b/src/dirs.proj @@ -41,13 +41,14 @@ <ProjectFile Include="delayimp\delayimp.nativeproj" Condition="'$(BuildProjectName)' != 'CoreSys'"/> <ProjectFile Include="dlls\dirs.proj" /> <ProjectFile Include="unwinder\dirs.proj" Condition="'$(TargetArch)' != 'i386'" /> + + <!-- In the CodeGen branch, we use RyuJIT for all JIT builds --> + <ProjectFile Include="jit\dirs.proj" Condition="'$(_BuildBranch)' == 'CodeGen'" /> - <!-- In FXMain we build RyuJIT only for amd64 and arm64 --> - <ProjectFile Include="jit32\dirs.proj" Condition="'$(BuildArchitecture)' != 'amd64' and '$(BuildArchitecture)' != 'arm64'"/> - <ProjectFile Include="jit\dirs.proj" Condition="'$(BuildArchitecture)' == 'amd64' or '$(BuildArchitecture)' == 'arm64'"/> - <!-- In Codegen we always build RyuJIT this includes x86 as well as amd64 and arm64 ==> - <ProjectFile Include="jit\dirs.proj" /> - --> + <!-- In other branches, we build RyuJIT only for amd64 and arm64, and use JIT32 for ARM and x86 --> + <ProjectFile Include="jit\dirs.proj" Condition="('$(_BuildBranch)' != 'CodeGen') and ('$(BuildArchitecture)' == 'amd64' or '$(BuildArchitecture)' == 'arm64')" /> + <ProjectFile Include="jit32\dirs.proj" Condition="('$(_BuildBranch)' != 'CodeGen') and ('$(BuildArchitecture)' != 'amd64' and '$(BuildArchitecture)' != 'arm64')" /> + <ProjectFile Include="jit64\dirs.proj" /> <ProjectFile Include="tools\dirs.proj" /> |