Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use add_link_options and target_link_options in cmake #92844

Merged
merged 17 commits into from
Oct 17, 2023
Merged

Use add_link_options and target_link_options in cmake #92844

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
821aafc
Use add_linker_options and target_linker_options in cmake
jtschuster Sep 30, 2023
6f611a5
Update add_link_options usage
jtschuster Oct 2, 2023
3387f91
remove LINKER: prefix when not needed
jtschuster Oct 2, 2023
43d1cad
convert uses of CMAKE_<TYPE>_LINKER_FLAGS to add_link_options and LIN…
jtschuster Oct 3, 2023
637c51f
Fix -fuse-ld issues and -Xlinker usage
jtschuster Oct 3, 2023
c1a131d
Use old variable for static library linker flags
jtschuster Oct 3, 2023
fdbb189
update target_link_options usage
jtschuster Oct 3, 2023
d67e9f3
Don't error quiet so I can see issue
jtschuster Oct 3, 2023
0cf4924
Use CMAKE_SHARED_LINKER_FLAGS for getting linker version
jtschuster Oct 4, 2023
b688b62
Only set VS Link options in DEBUG config
jtschuster Oct 5, 2023
b64de87
Use replace for /LTCG on static libs
jtschuster Oct 5, 2023
acb0edb
Merge branch 'main' of https://github.com/dotnet/runtime into AddLink…
jtschuster Oct 5, 2023
78a92a5
Go back to assuming LD_OSX if no other linker found
jtschuster Oct 5, 2023
eaa67e6
Don't add library flags to all
jtschuster Oct 5, 2023
337f015
Remove quotes around linker flags
jtschuster Oct 5, 2023
b89a82c
Use generator expression when adding /DEPENDENTLOADFLAG:0x800
jtschuster Oct 6, 2023
bf4851a
Revert to old method for DEPENDENLOADFLAG
jtschuster Oct 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions eng/native/configurecompiler.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,13 +112,14 @@ if (MSVC)

if (CMAKE_GENERATOR MATCHES "^Visual Studio.*$")
# Debug build specific flags
# The Ninja generator doesn't appear to have the default `/INCREMENTAL:ON` that
# The Ninja generator doesn't appear to have the default `/INCREMENTAL:NO` that
jtschuster marked this conversation as resolved.
Show resolved Hide resolved
# the Visual Studio generator has. Therefore we will override the default for Visual Studio only.
add_link_options($<$<CONFIG:DEBUG>/INCREMENTAL:NO>)
add_link_options($<$<CONFIG:DEBUG>:/OPT:NOICF>)
add_link_options($<$<CONFIG:DEBUG>:/OPT:NOREF>)
endif (CMAKE_GENERATOR MATCHES "^Visual Studio.*$")
# Options for all configs
add_link_options(/INCREMENTAL:NO>)
add_link_options(/OPT:REF>)
# Options for all but DEBUG
add_link_options($<$<CONFIG:CHECKED,RELWITHDEBINFO,RELEASE>:/INCREMENTAL:NO>)

# Checked build specific flags
add_link_options($<$<CONFIG:CHECKED>:/OPT:NOICF>)
Expand All @@ -127,7 +128,7 @@ if (MSVC)
add_link_options($<$<CONFIG:RELEASE,RELWITHDEBINFO>:/OPT:ICF>)

# Set LTCG for RELEASE and RELWITHDEBINFO builds that are compatible
set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} $<$<AND:$<NOT:$<LINK_LANGUAGE:RC>>,$<CONFIG:RELEASE,RELWITHDEBINFO>>:/LTCG>")
set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} $<$<AND:$<NOT:$<LINK_LANGUAGE:RC>>,$<CONFIG:RELEASE,RELWITHDEBINFO>>:/LTCG>")

elseif (CLR_CMAKE_HOST_UNIX)
# Set the values to display when interactively configuring CMAKE_BUILD_TYPE
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/dlls/clretwrc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ if(CLR_CMAKE_HOST_WIN32)
set_property(DIRECTORY PROPERTY CLR_EH_CONTINUATION OFF)
endif (CLR_CMAKE_HOST_ARCH_AMD64)

target_link_options(clretwrc PRIVATE "/NOENTRY")
add_link_options(/NOENTRY)
endif(CLR_CMAKE_HOST_WIN32)

add_definitions(-DFX_VER_INTERNALNAME_STR=clretwrc.dll)
Expand Down
1 change: 0 additions & 1 deletion src/coreclr/pgosupport.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ function(add_pgo TargetName)
endif(CMAKE_CROSSCOMPILING AND CMAKE_C_COMPILER_ID MATCHES "Clang")
if(LD_GNU) # Only use gold when it wouldn't change the LD_<LINKER> value
target_link_options(${TargetName} PRIVATE "-fuse-ld=gold")
set(FUSE_LD "-fuse-ld=gold")
endif()
endif(UPPERCASE_CMAKE_BUILD_TYPE STREQUAL RELEASE OR UPPERCASE_CMAKE_BUILD_TYPE STREQUAL RELWITHDEBINFO)
endif(CLR_CMAKE_HOST_WIN32)
Expand Down