diff options
| author | Jeremy Koritzinsky <jekoritz@microsoft.com> | 2019-10-18 02:29:52 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-18 02:29:52 +0300 |
| commit | fed828a60fa9c93878ab11311f87f67bf6af2bc0 (patch) | |
| tree | bdcb2ba5abee72bb4e8e040b3234b64bf5b5be3c /src/coreclr/CMakeLists.txt | |
| parent | 57a89914d6397fa4cde4725b9636f63364cb1e4d (diff) | |
Simplify native component build (dotnet/coreclr#27077)
* Move discovery of compiler-specific tools out of gen-buildsys-* and into CMake via a configuretools.cmake file.
* Split finding the compiler from calling CMake to generate the build system. Fold as much of gen-buildsys into the CMake scripts as possible.
First pass at moving builds to cmake --build.
* Clean up build.cmd.
* Remove extra MSBuild-specific logging of native components builds.
* Fix discovering linux id.
* Move code-coverage enable out of gen-buildsys.sh
* Fix gen-buildsys.sh argument validation.
* Fix objcopy search condition.
* Add back logging parameters. Make sure we don't regress on throughput.
* Match version lookup behavior in find-clang and find-gcc.
* Determine compiler version for tool location from the file name.
* Fix typo
* PR Feedback.
Commit migrated from https://github.com/dotnet/coreclr/commit/4c1e029deac53212c496c14010b11fc5fa3601a6
Diffstat (limited to 'src/coreclr/CMakeLists.txt')
| -rw-r--r-- | src/coreclr/CMakeLists.txt | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/src/coreclr/CMakeLists.txt b/src/coreclr/CMakeLists.txt index 3036bf5aeae..50fec2a4640 100644 --- a/src/coreclr/CMakeLists.txt +++ b/src/coreclr/CMakeLists.txt @@ -105,32 +105,14 @@ else (WIN32) message(FATAL_ERROR "strip not found") endif() - else (CMAKE_SYSTEM_NAME STREQUAL Darwin) - - # Ensure that objcopy is present - if (CLR_UNIX_CROSS_BUILD AND NOT DEFINED CLR_CROSS_COMPONENTS_BUILD) - if (CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l OR CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL arm) - find_program(OBJCOPY ${TOOLCHAIN}-objcopy) - elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL i686) - find_program(OBJCOPY objcopy) - else() - clr_unknown_arch() - endif() - else() - find_program(OBJCOPY objcopy) - endif() - - if (OBJCOPY STREQUAL "OBJCOPY-NOTFOUND") - message(FATAL_ERROR "objcopy not found") - endif() - - endif (CMAKE_SYSTEM_NAME STREQUAL Darwin) + endif() endif(WIN32) #---------------------------------------------------- # Configure compiler settings for environment #---------------------------------------------------- include(configurecompiler.cmake) +include(configuretools.cmake) #---------------------------------------------------- # Cross target Component build specific configuration |