Minimum CMake downgrade for Linux #39044

jkoritzinsky · 2020-07-09T22:55:05Z

Downgrade the minimum version of CMake to 3.6.2 for our Linux builds and change our CMake scripts appropriately:

Currently completed steps:

Provide our own implementation of add_compile_definitions since it is easily polyfillable
Move away from add_link_options since it is not easy to create our own implementation of that functions the same. Move back to setting linker options via the flag properties.
Manually enable PIE/PIC on Linux/Mac (this support was added in CMake 3.9)
Manually check for IPO support on Linux/Mac (this support was added in CMake 3.13)
Revert to the old CMake command line (this support was added in CMake 3.10)

So far I've only undone the changes that I made in dotnet/coreclr#26980 that I know are required. @janvorli can you help out with some of the other issues that we'll encounter when lowering the CMake version? I don't know all of the corner case behaviors that we've started to depend on in the last 10ish months.

Validation that we actually build on CMake 3.6.2 will come when we get a new Docker image has CMake 3.6.2 (and no newer) installed (@jashook is working on this).

Contributes to #38755

Depends on dotnet/arcade#5770

cc: @dleeapho @janvorli @jashook @omajid @jkotas @tmds @wfurt @RheaAyase

…here the new one isn't implemented yet.

ghost · 2020-07-09T22:55:08Z

Tagging subscribers to this area: @ViktorHofer
Notify danmosemsft if you want to be subscribed.

eng/native/configurecompiler.cmake

src/coreclr/src/dlls/mscoree/coreclr/CMakeLists.txt

eng/native/configureplatform.cmake

eng/native/build-commons.sh

eng/native/configureplatform.cmake

src/coreclr/pgosupport.cmake

src/coreclr/src/ToolBox/SOS/DacTableGen/CMakeLists.txt

src/libraries/Native/Unix/CMakeLists.txt

omajid · 2020-07-14T18:27:34Z

Thanks for this PR!

I tried building ad16a9797a2e899caec8a610f667789e0bec6524 using ./build.sh on RHEL 8. It doesn't seem to work. This is cmake version 3.11.4

  Detected Linux x86_64                                                                                                                                                                                                                       
  -- Performing Test COMPILER_SUPPORTS_F_STACK_PROTECTOR_STRONG                                                                                                                                                                                 -- Performing Test COMPILER_SUPPORTS_F_STACK_PROTECTOR_STRONG - Success                                                                                                                                                                       -- The ASM compiler identification is Clang                                                                                                                                                                                                 
  -- Found assembler: /usr/bin/clang                                                                                                                                                                                                          
  CMake Error at cli/exe.cmake:7 (cmake_policy):                                                                                                                                                                                                  Policy "CMP0083" is not known to this version of CMake.                                                                                                                                                                                   
  Call Stack (most recent call first):                                                                                                                                                                                                            cli/apphost/static/CMakeLists.txt:41 (include)                                                                                                                                                                                            
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
  -- Performing Test HAVE_DIRENT_D_TYPE                                                                                                                                                                                                         -- Performing Test HAVE_DIRENT_D_TYPE - Success                                                                                                                                                                                             
  Looking for coreclr_static lib at location: '/home/dotnet/runtime/artifacts/bin/coreclr/Linux.x64.Debug//lib'.                                                                                                                                CMake Error at cli/exe.cmake:7 (cmake_policy):                                                                                                                                                                                              
    Policy "CMP0083" is not known to this version of CMake.                                                                                                                                                                                     Call Stack (most recent call first):                                                                                                                                                                                                        
    cli/apphost/standalone/CMakeLists.txt:39 (include)                                                                                                                                                                                                                                                                                                                                                                                                                                      
                                                                                                                                                                                                                                                CMake Error at cli/exe.cmake:7 (cmake_policy):                                                                                                                                                                                              
    Policy "CMP0083" is not known to this version of CMake.                                                                                                                                                                                   
  Call Stack (most recent call first):                                                                                                                                                                                                        
    cli/dotnet/CMakeLists.txt:16 (include)                                                                                                                                                                                                    
                                                                                                                                                                                                                                              
                                                                                                                                                                                                                                              
  CMake Error at cli/fxr/standalone/CMakeLists.txt:51 (target_link_libraries):                                                                                                                                                                
    Target "libhostfxr_static" of type OBJECT_LIBRARY may not be linked into                                                                                                                                                                  
    another target.  One may link only to INTERFACE, STATIC or SHARED                                                                                                                                                                         
    libraries, or to executables with the ENABLE_EXPORTS property set.                                                                                                                                                                        
                                                                                                                                                                                                                                              
                                                                                                                                                                                                                                              
  CMake Error at cli/test/mockhostfxr/CMakeLists.txt:4 (cmake_minimum_required):                                                                                                                                                              
    CMake 3.14.5 or higher is required.  You are running version 3.11.4                                                                                                                                                                       
                                                                                                                                                                                                                                              
   
  -- Configuring incomplete, errors occurred!

Please let me know if there's anything I can do to help.

jkoritzinsky · 2020-07-14T18:34:14Z

I've fixed the issues that I've found relatively simple (removing the unknown policy and removing the extra cmake_minimum_required), but I'm not sure how to fix the libhostfxr_static linking issue. If you know how to downgrade that, I'd appreciate the help.

omajid · 2020-07-14T18:35:20Z

If you know how to downgrade that, I'd appreciate the help.

Not off the top of my head. I will dig around.

janvorli · 2020-07-14T20:01:06Z

but I'm not sure how to fix the libhostfxr_static linking issue

The object libraries cannot be used as regular libraries to link to prior to cmake 3.14. All places need to be changed so that the objects from the object libraries are added to the respective targets like source files. E.g.:

add_library(... $<TARGET_OBJECTS:objlib> ...)

jashook · 2020-07-14T20:31:25Z

I am having trouble building with 3.6.2. Seems that https://github.com/dotnet/runtime/blob/master/src/coreclr/src/vm/eventing/CMakeLists.txt#L11 requires cmake 3.8+.

How did you get around this @jkoritzinsky

jkoritzinsky · 2020-07-14T20:33:39Z

I forgot about that. I need to roll that back to use the old find python module.

jkoritzinsky · 2020-07-14T21:26:48Z

@safern can you take a look at the libraries build failures on OSX?

janvorli · 2020-07-31T07:46:45Z

I've pushed a fix. The problem was that the VM_HEADERS_WKS_ARCH_ASM that contained the asmconstants.h was being added to VM_SOURCES_WKS_ARCH_ASM, which is a set of files that are to be compiled with assembler. It needed to be added to VM_SOURCES_WKS instead (which is done just to let the header appear in the visual studio solution explorer, cmake is clever enough to not to pass .h files to the C++ compiler).

jkoritzinsky · 2020-07-31T16:43:34Z

@omajid can you do a test build against the RHEL 7 image you'll be building against for the distro build?

omajid · 2020-07-31T17:09:50Z

@omajid can you do a test build against the RHEL 7 image you'll be building against for the distro build?

Of course. I have tested on RHEL 8 using this PR (it works!). I am currently testing on RHEL 8 end-to-end now (using source-build Preview 4 + a manual backport of this patch). If/when that works, RHEL 7 is next on my list.

omajid · 2020-07-31T21:30:42Z

@omajid can you do a test build against the RHEL 7 image you'll be building against for the distro build?

A ./build.sh clr works with commit 265f684da4d370909c70399fd9be4bd089c607b2 after this trivial change:

diff --git a/src/installer/corehost/CMakeLists.txt b/src/installer/corehost/CMakeLists.txt
index 178d8ab..46d1c5e 100644
--- a/src/installer/corehost/CMakeLists.txt
+++ b/src/installer/corehost/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.6.3)
+cmake_minimum_required(VERSION 3.6.2)
 
 project(corehost)
 
diff --git a/src/libraries/Native/Unix/CMakeLists.txt b/src/libraries/Native/Unix/CMakeLists.txt
index dee9e51..3168c7e 100644
--- a/src/libraries/Native/Unix/CMakeLists.txt
+++ b/src/libraries/Native/Unix/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.6.3)
+cmake_minimum_required(VERSION 3.6.2)
 if(CLR_CMAKE_TARGET_IOS OR CLR_CMAKE_TARGET_TVOS) 
      # CMake 3.14.5 contains bug fixes for iOS 
      cmake_minimum_required(VERSION 3.14.5) 
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index c75e5db..77fcc16 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.6.3)
+cmake_minimum_required(VERSION 3.6.2)
 
 cmake_policy(SET CMP0042 NEW)
 project(Tests)

Edit: I am still working on backporting this to preview 4 so I can test end-to-end with source-build (on RHEL 7 and RHEL 8).

jkoritzinsky · 2020-07-31T21:47:18Z

I've applied your patch. Marking this PR as ready for review/non-work in progress

akoeplinger

The non-coreclr specific changes look good to me (can't vouch for the coreclr changes).

janvorli · 2020-08-03T14:47:38Z

src/coreclr/src/classlibnative/bcltype/CMakeLists.txt

    OBJECT
    ${BCLTYPE_SOURCES}
 )

-add_dependencies(bcltype eventing_headers)
+add_dependencies(bcltype_obj eventing_headers)
+add_library(bcltype INTERFACE)


An idea for a future cleanup: This add_library / target_sources pair pattern is used at 24 places. It may be nice to clean this up in a follow up change by creating a cmake function for this pattern. Or even encapsulate the add_library_clr in that function, getting something along these lines:

add_intermediate_library_clr(bcltype ${BCLTYPE_SOURCES}) add_intermediate_library_dependencies(bcltype eventing_headers)

Yes, we should clean this up in the future by making some additional functions.

janvorli · 2020-08-03T14:56:01Z

src/installer/corehost/cli/apphost/static/CMakeLists.txt

@@ -30,6 +30,8 @@ set(HEADERS
    ../../../hostfxr_resolver.h
 )

+list(APPEND SOURCES $<TARGET_OBJECTS:libhostfxr_static> $<TARGET_OBJECTS:libhostpolicy_static>)


I wonder why was this change needed. Linking to the static libraries should work fine. The only case when we need to use object libraries is when a static library is built as a combination of other libraries, but it is not the case here.

The libhostfxr_static and libhostpolicy_static targets are object libraries. The corehost CMake infra could really use some updates and cleanup to be more straightforward. I'd like to do that in a future PR.

Hmm, interesting. I can see that they were changed to object ones few months ago and I am not sure why.

I agree that the corehost cmakefiles are very difficult to mentally parse. They looks as if msbuild style of build programming was used here. Instead of using functions for doing common stuff, ambient cmake variables are being set and then common helper cmake files included. I'd love to see it transformed to a natural cmake way at some point.

src/libraries/Native/Unix/System.Globalization.Native/CMakeLists.txt

jeffschwMSFT · 2020-08-04T17:08:17Z

cc @mmitche

jkoritzinsky · 2020-08-04T17:36:42Z

@janvorli any more comments?

janvorli

LGTM, thank you!

janvorli · 2020-08-04T18:03:07Z

@jkoritzinsky no, I have thought I've already approved it, but I can see I haven't. So I've just done that.

jashook · 2020-08-04T18:04:51Z

Thank you @jkoritzinsky for driving this effort!

jashook · 2020-08-04T19:08:36Z

@omajid which version of clang are we using on redhat 7 for source build? We noticed that by default centos 7 installs 3.4 which we do not support building with.

/cc @janvorli @jkoritzinsky

omajid · 2020-08-04T19:19:09Z

which version of clang are we using on redhat 7 for source build?

We have generally used llvm-toolset-7.0-cmake (CentOS version here), which is 3.6.2.

This is how we are building 3.1 with llvm-toolset-7.0: https://git.centos.org/rpms/rh-dotnet31-dotnet/blob/c7-dotnet/f/SPECS/dotnet.spec#_314. I don't have a 5.0 version yet, because I haven't been able to build source-build there.

jashook · 2020-08-04T23:16:26Z

Clean builds using the following:

Os	Cmake	Clang/llvm
Centos 7	3.6.2	7
Centos 8	3.11.4	8

mmitche · 2020-08-06T14:36:56Z

@jeffschwMSFT Was this supposed to be ported to p8?

jeffschwMSFT · 2020-08-06T15:10:21Z

@mmitche yes, @jashook is working on the port.

omajid · 2020-08-06T15:14:52Z

I did a port to preview 4, so I could build against older cmake versions using source-build. Source-build is currently at 5.0 Preview 4. Port is available here: https://github.com/omajid/runtime/tree/5.0-preview4-cmake-backport

Co-authored-by: Santiago Fernandez Madero <safern@microsoft.com> Co-authored-by: Jan Vorlicek <janvorli@microsoft.com>

Co-authored-by: Santiago Fernandez Madero <safern@microsoft.com> Co-authored-by: Jan Vorlicek <janvorli@microsoft.com> Co-authored-by: Jeremy Koritzinsky <jekoritz@microsoft.com> Co-authored-by: Santiago Fernandez Madero <safern@microsoft.com> Co-authored-by: Jan Vorlicek <janvorli@microsoft.com>

Co-authored-by: Santiago Fernandez Madero <safern@microsoft.com> Co-authored-by: Jan Vorlicek <janvorli@microsoft.com>

jkoritzinsky added 9 commits July 9, 2020 11:32

Fix sanitizer flags

edcd3f6

Polyfill add_compile_definitions when needed.

e07303b

Convert add_link_options back to the old style linker flags.

275a6c1

Downgrade minimum version of cmake for CoreCLR build.

89d7de0

Remove add_link_options from the libraries build.

6916de3

Lower required max CMake version for runtime tests/libraries, and hosts.

386beaf

Fix linux build with cmake downgrade.

fead695

Update to the eng/common/cross/toolchain.cmake in dotnet/arcade#5770.

114c9ce

Switch back to old CMake command line since we have to downgrade to w…

050d7d5

…here the new one isn't implemented yet.

jkoritzinsky added the area-Infrastructure label Jul 9, 2020

jkoritzinsky added this to the 5.0.0 milestone Jul 9, 2020

janvorli reviewed Jul 9, 2020

View reviewed changes

eng/native/configureplatform.cmake Outdated Show resolved Hide resolved

jkoritzinsky added 2 commits July 9, 2020 17:06

PR Feedback.

c61655f

Add support for multiple configurations in add_linker_flag

fa60790

jashook mentioned this pull request Jul 10, 2020

runtime depends on extremely recent verisons of cmake, blocking adoption on Linux #38755

Closed

akoeplinger reviewed Jul 10, 2020

View reviewed changes

PR feedback

ad16a97

janvorli mentioned this pull request Jul 14, 2020

PAL_VirtualUnwindOutOfProc for MacOS #39213

Merged

Fix release build by disabling incremental linking.

9fbe0e6

Fix warnings/errors in the installer build running on CMake 3.6.2.

cae4e81

Use old python location package in CMake.

8e0ff48

Fix issue with asmconstants

265f684

jkoritzinsky marked this pull request as ready for review July 31, 2020 19:10

Fix minimum CMake version.

df3178d

jkoritzinsky changed the title ~~[WIP] Minimum CMake downgrade for Linux~~ Minimum CMake downgrade for Linux Jul 31, 2020

akoeplinger approved these changes Aug 3, 2020

View reviewed changes

janvorli reviewed Aug 3, 2020

View reviewed changes

Fix nit.

99e5d1e

janvorli approved these changes Aug 4, 2020

View reviewed changes

jkoritzinsky merged commit ece10ad into dotnet:master Aug 4, 2020

jkoritzinsky deleted the cmake-downgrade branch August 4, 2020 18:04

jashook pushed a commit to jashook/runtime that referenced this pull request Aug 6, 2020

Minimum CMake downgrade for Linux (dotnet#39044)

0aadb20

Co-authored-by: Santiago Fernandez Madero <safern@microsoft.com> Co-authored-by: Jan Vorlicek <janvorli@microsoft.com>

jashook mentioned this pull request Aug 6, 2020

Minimum CMake downgrade for Linux (#39044) #40471

Merged

Jacksondr5 pushed a commit to Jacksondr5/runtime that referenced this pull request Aug 10, 2020

Minimum CMake downgrade for Linux (dotnet#39044)

60e7d07

Co-authored-by: Santiago Fernandez Madero <safern@microsoft.com> Co-authored-by: Jan Vorlicek <janvorli@microsoft.com>

ghost locked as resolved and limited conversation to collaborators Dec 8, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Minimum CMake downgrade for Linux #39044

Minimum CMake downgrade for Linux #39044

jkoritzinsky commented Jul 9, 2020

ghost commented Jul 9, 2020

omajid commented Jul 14, 2020 •

edited

jkoritzinsky commented Jul 14, 2020

omajid commented Jul 14, 2020

janvorli commented Jul 14, 2020

jashook commented Jul 14, 2020

jkoritzinsky commented Jul 14, 2020

jkoritzinsky commented Jul 14, 2020

janvorli commented Jul 31, 2020

jkoritzinsky commented Jul 31, 2020

omajid commented Jul 31, 2020

omajid commented Jul 31, 2020 •

edited

jkoritzinsky commented Jul 31, 2020

akoeplinger left a comment

janvorli Aug 3, 2020

jkoritzinsky Aug 3, 2020

janvorli Aug 3, 2020

jkoritzinsky Aug 3, 2020

janvorli Aug 3, 2020

jeffschwMSFT commented Aug 4, 2020

jkoritzinsky commented Aug 4, 2020

janvorli left a comment

janvorli commented Aug 4, 2020

jashook commented Aug 4, 2020

jashook commented Aug 4, 2020

omajid commented Aug 4, 2020 •

edited

jashook commented Aug 4, 2020 •

edited

mmitche commented Aug 6, 2020

jeffschwMSFT commented Aug 6, 2020

omajid commented Aug 6, 2020

Minimum CMake downgrade for Linux #39044

Minimum CMake downgrade for Linux #39044

Conversation

jkoritzinsky commented Jul 9, 2020

ghost commented Jul 9, 2020

omajid commented Jul 14, 2020 • edited

jkoritzinsky commented Jul 14, 2020

omajid commented Jul 14, 2020

janvorli commented Jul 14, 2020

jashook commented Jul 14, 2020

jkoritzinsky commented Jul 14, 2020

jkoritzinsky commented Jul 14, 2020

janvorli commented Jul 31, 2020

jkoritzinsky commented Jul 31, 2020

omajid commented Jul 31, 2020

omajid commented Jul 31, 2020 • edited

jkoritzinsky commented Jul 31, 2020

akoeplinger left a comment

Choose a reason for hiding this comment

janvorli Aug 3, 2020

Choose a reason for hiding this comment

jkoritzinsky Aug 3, 2020

Choose a reason for hiding this comment

janvorli Aug 3, 2020

Choose a reason for hiding this comment

jkoritzinsky Aug 3, 2020

Choose a reason for hiding this comment

janvorli Aug 3, 2020

Choose a reason for hiding this comment

jeffschwMSFT commented Aug 4, 2020

jkoritzinsky commented Aug 4, 2020

janvorli left a comment

Choose a reason for hiding this comment

janvorli commented Aug 4, 2020

jashook commented Aug 4, 2020

jashook commented Aug 4, 2020

omajid commented Aug 4, 2020 • edited

jashook commented Aug 4, 2020 • edited

mmitche commented Aug 6, 2020

jeffschwMSFT commented Aug 6, 2020

omajid commented Aug 6, 2020

omajid commented Jul 14, 2020 •

edited

omajid commented Jul 31, 2020 •

edited

omajid commented Aug 4, 2020 •

edited

jashook commented Aug 4, 2020 •

edited