Skip to content

Commit

Permalink
Build accelerator
Browse files Browse the repository at this point in the history
  • Loading branch information
MichalStrehovsky committed Sep 7, 2020
1 parent c9f9109 commit 6cec9ba
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 20 deletions.
2 changes: 1 addition & 1 deletion src/coreclr/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ include_directories("../../artifacts/obj/coreclr")

if(FEATURE_STANDALONE_GC)
add_definitions(-DFEATURE_STANDALONE_GC)
add_subdirectory(src/gc)
#add_subdirectory(src/gc)
endif(FEATURE_STANDALONE_GC)

if (CLR_CMAKE_HOST_UNIX)
Expand Down
37 changes: 19 additions & 18 deletions src/coreclr/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ if(CLR_CMAKE_TARGET_WIN32 AND FEATURE_EVENT_TRACE)
include_directories("${GENERATED_INCLUDE_DIR}/etw")
endif(CLR_CMAKE_TARGET_WIN32 AND FEATURE_EVENT_TRACE)

add_subdirectory(debug/dbgutil)
#add_subdirectory(debug/dbgutil)

if(CLR_CMAKE_HOST_UNIX)
if(CLR_CMAKE_HOST_OSX OR (CLR_CMAKE_HOST_LINUX AND NOT CLR_CMAKE_HOST_UNIX_X86 AND NOT CLR_CMAKE_HOST_ANDROID))
add_subdirectory(debug/createdump)
# add_subdirectory(debug/createdump)
endif(CLR_CMAKE_HOST_OSX OR (CLR_CMAKE_HOST_LINUX AND NOT CLR_CMAKE_HOST_UNIX_X86 AND NOT CLR_CMAKE_HOST_ANDROID))

# Include the dummy c++ include files
Expand Down Expand Up @@ -55,28 +55,29 @@ if(CLR_CMAKE_HOST_UNIX)

endfunction()

add_subdirectory(nativeresources)
# add_subdirectory(nativeresources)
endif(CLR_CMAKE_HOST_UNIX)

add_subdirectory(utilcode)
add_subdirectory(gcinfo)
add_subdirectory(jit)
add_subdirectory(vm)
add_subdirectory(md)
add_subdirectory(debug)
add_subdirectory(inc)
add_subdirectory(binder)
add_subdirectory(classlibnative)
add_subdirectory(dlls)
add_subdirectory(ToolBox)
add_subdirectory(tools)
add_subdirectory(unwinder)
add_subdirectory(ildasm)
add_subdirectory(ilasm)
add_subdirectory(interop)
include_directories("vm")
add_subdirectory(vm/eventing)
#add_subdirectory(md)
#add_subdirectory(debug)
#add_subdirectory(inc)
#add_subdirectory(binder)
#add_subdirectory(classlibnative)
#add_subdirectory(dlls)
#add_subdirectory(ToolBox)
#add_subdirectory(tools)
#add_subdirectory(unwinder)
#add_subdirectory(ildasm)
#add_subdirectory(ilasm)
#add_subdirectory(interop)

if(CLR_CMAKE_HOST_UNIX)
add_subdirectory(palrt)
# add_subdirectory(palrt)
elseif(CLR_CMAKE_HOST_WIN32)
add_subdirectory(hosts)
# add_subdirectory(hosts)
endif(CLR_CMAKE_HOST_UNIX)
2 changes: 1 addition & 1 deletion src/coreclr/src/vm/eventing/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ set_source_files_properties(${EventingHeaders} PROPERTIES GENERATED TRUE)

add_dependencies(eventing_headers eventprovider)

add_subdirectory(eventpipe)
#add_subdirectory(eventpipe)

if(CLR_CMAKE_HOST_WIN32)
add_subdirectory(EtwProvider)
Expand Down
1 change: 1 addition & 0 deletions src/libraries/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@
<!-- TODO: Reenable when mono supports utf8string. -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)\System.Utf8String.Experimental\**\*.csproj" Condition="'$(RuntimeFlavor)' == 'Mono'" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)\System.Utf8String.Experimental\**\*.csproj" Condition="'$(ClrNativeAOT)' == 'true'" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)\Microsoft.Extensions*\**\*.csproj" Condition="'$(ClrNativeAOT)' == 'true'" />
</ItemGroup>

<PropertyGroup>
Expand Down

0 comments on commit 6cec9ba

Please sign in to comment.