mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-22 06:59:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

LinkerId: Fix detection of linker tool for GNU on SunOS sparc32

Browse Source 
We do not use `-Wl,-v` on SunOS because not all GNU deployments use the
`collect2` helper, and those that do do not always print the underlying
`ld` command line.  Parse the `--with-ld=` option as a fallback.
This commit is contained in:
Brad King
2023-12-19 14:32:20 -05:00
parent dd480e5be5
commit 78b7ba6494
5 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Modules/CMakeParseImplicitLinkInfo.cmake
View File

@@ -75,8 +75,9 @@ function(cmake_parse_implicit_link_info2 text log_var obj_regex)
set(linker_regex "^( *|.*[/\\])(${linker}|${startfile}|([^/\\]+-)?ld|collect2)[^/\\]*( |$)")
set(linker_exclude_regex "collect2 version |^[A-Za-z0-9_]+=|/ldfe ")
set(linker_tool_regex "^[ \t]*(->|\")?[ \t]*(.*[/\\](${linker}))(\"|,| |$)")
set(linker_tool_exclude_regex "cuda-fake-ld|-fuse-ld=|--with-ld=")
set(linker_tool_exclude_regex "cuda-fake-ld|-fuse-ld=")
set(linker_tool "NOTFOUND")
set(linker_tool_fallback "")
set(link_line_parsed 0)
string(APPEND log " link line regex: [${linker_regex}]\n")
if(EXTRA_PARSE_COMPUTE_LINKER)
@@ -90,6 +91,12 @@ function(cmake_parse_implicit_link_info2 text log_var obj_regex)
set(linker_tool "${CMAKE_MATCH_1}")
elseif("${line}" MATCHES "^export XL_LINKER=(.*/${linker})[ \t]*$") # IBM XL
set(linker_tool "${CMAKE_MATCH_1}")
elseif("${line}" MATCHES "--with-ld=") # GNU
# The GNU compiler reports how it was configured.
# This does not account for -fuse-ld= so use it only as a fallback.
if("${line}" MATCHES " --with-ld=([^ ]+/${linker})( |$)")
set(linker_tool_fallback "${CMAKE_MATCH_1}")
endif()
elseif("${line}" MATCHES "${linker_tool_regex}")
set(linker_tool "${CMAKE_MATCH_2}")
endif()
@@ -258,6 +265,9 @@ function(cmake_parse_implicit_link_info2 text log_var obj_regex)
endif()
endforeach()
if(NOT linker_tool AND linker_tool_fallback)
set(linker_tool "${linker_tool_fallback}")
endif()
if(linker_tool)
if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
# pick-up last path

2
Tests/RunCMake/ParseImplicitLinkInfo/results/freebsd-Fortran-GNU-4.6.4.output
View File

@@ -1,3 +1,3 @@
libs=gfortran;m;gcc_s;gcc;quadmath;m;gcc_s;gcc;c;gcc_s;gcc
dirs=/usr/local/lib/gcc46/gcc/x86_64-portbld-freebsd10.0/4.6.4;/usr/local/x86_64-portbld-freebsd10.0/lib;/usr/local/lib/gcc46
linker_tool=
linker_tool=/usr/local/bin/ld

2
Tests/RunCMake/ParseImplicitLinkInfo/results/sunos5.10_sparc32-C-GNU-5.5.0.output
View File

@@ -1,3 +1,3 @@
libs=gcc;c;gcc;c
dirs=/lib;/usr/lib;/opt/csw/lib/gcc/sparc-sun-solaris2.10/5.5.0;/opt/csw/sparc-sun-solaris2.10/lib;/opt/csw/lib
linker_tool=
linker_tool=/usr/ccs/bin/ld

2
Tests/RunCMake/ParseImplicitLinkInfo/results/sunos5.10_sparc32-CXX-GNU-5.5.0.output
View File

@@ -1,3 +1,3 @@
libs=stdc\+\+;m;rt;gcc_s;gcc;c;gcc_s;gcc;c
dirs=/lib;/usr/lib;/opt/csw/lib/gcc/sparc-sun-solaris2.10/5.5.0;/opt/csw/sparc-sun-solaris2.10/lib;/opt/csw/lib
linker_tool=
linker_tool=/usr/ccs/bin/ld

2
Tests/RunCMake/ParseImplicitLinkInfo/results/sunos5.10_sparc32-Fortran-GNU-5.5.0.output
View File

@@ -1,3 +1,3 @@
libs=gfortran;m;gcc_s;gcc;m;gcc_s;gcc;c;gcc_s;gcc;m;gcc_s;gcc;c
dirs=/lib;/usr/lib;/opt/csw/lib/gcc/sparc-sun-solaris2.10/5.5.0;/opt/csw/sparc-sun-solaris2.10/lib;/opt/csw/lib
linker_tool=
linker_tool=/usr/ccs/bin/ld