This is an archive of the discontinued LLVM Phabricator instance.

Differential D86245

Fix an issue where get_system_libname creates an empty regex capture on windows
ClosedPublic

Authored by haampie on Aug 19 2020, 1:39 PM.

Details

Reviewers
phosek
aeubanks
JDevlieghere
Commits
rG1ed1e16ab83f: [CMake] Fix an issue where get_system_libname creates an empty regex capture on…
Summary

Fixes https://bugs.chromium.org/p/chromium/issues/detail?id=1119478

Diff Detail

Event Timeline

haampie created this revision.Aug 19 2020, 1:39 PM
Herald added a project: Restricted Project. · View Herald TranscriptAug 19 2020, 1:39 PM
Herald added subscribers: llvm-commits, hiraditya, mgorny. · View Herald Transcript
haampie requested review of this revision.Aug 19 2020, 1:39 PM
aeubanks added a comment.Aug 19 2020, 1:47 PM

Just tested this out, yes it fixes the issue thanks!
Although I'm not at all familiar with CMake, so somebody else should probably review.

haampie mentioned this in D86134: Fix OCaml build failure because of absolute path in system libs.Aug 19 2020, 1:48 PM
Harbormaster completed remote builds in B68942: Diff 286652.Aug 19 2020, 2:27 PM
phosek accepted this revision.Aug 19 2020, 2:32 PM

LGTM

This revision is now accepted and ready to land.Aug 19 2020, 2:32 PM
Closed by commit rG1ed1e16ab83f: [CMake] Fix an issue where get_system_libname creates an empty regex capture on… (authored by phosek). · Explain WhyAug 19 2020, 2:34 PM
This revision was automatically updated to reflect the committed changes.
phosek added a commit: rG1ed1e16ab83f: [CMake] Fix an issue where get_system_libname creates an empty regex capture on….
phosek mentioned this in D79219: [CMake] Simplify CMake handling for zlib.Aug 22 2020, 7:23 PM
haampie added a reverting change: D86521: Revert "Use find_library for ncurses".Aug 25 2020, 3:58 AM
gkistanova added a reverting change: rGcdcb9ab10e53: Revert "Use find_library for ncurses".Aug 27 2020, 5:58 PM

Revision Contents

PathSize
llvm/
lib/
Support/
12 lines

Diff 286667

llvm/lib/Support/CMakeLists.txt

if(LLVM_ENABLE_ZLIB) if(LLVM_ENABLE_ZLIB)
set(imported_libs ZLIB::ZLIB) set(imported_libs ZLIB::ZLIB)
endif() endif()
function(get_system_libname libpath libname) function(get_system_libname libpath libname)
get_filename_component(libpath ${libpath} NAME) get_filename_component(libpath ${libpath} NAME)
if( CMAKE_FIND_LIBRARY_PREFIXES )
string(REPLACE ";" "|" PREFIXES "${CMAKE_FIND_LIBRARY_PREFIXES}") string(REPLACE ";" "|" PREFIXES "${CMAKE_FIND_LIBRARY_PREFIXES}")
string(REGEX REPLACE "^(${PREFIXES})" "" libpath ${libpath})
endif()
if( CMAKE_FIND_LIBRARY_SUFFIXES )
string(REPLACE ";" "|" SUFFIXES "${CMAKE_FIND_LIBRARY_SUFFIXES}") string(REPLACE ";" "|" SUFFIXES "${CMAKE_FIND_LIBRARY_SUFFIXES}")
STRING(REGEX REPLACE "^(${PREFIXES})" "" libpath ${libpath}) string(REGEX REPLACE "(${SUFFIXES})$" "" libpath ${libpath})
STRING(REGEX REPLACE "(${SUFFIXES})$" "" libpath ${libpath}) endif()
set(${libname} "${libpath}" PARENT_SCOPE) set(${libname} "${libpath}" PARENT_SCOPE)
endfunction() endfunction()
if( MSVC OR MINGW ) if( MSVC OR MINGW )
# libuuid required for FOLDERID_Profile usage in lib/Support/Windows/Path.inc. # libuuid required for FOLDERID_Profile usage in lib/Support/Windows/Path.inc.
# advapi32 required for CryptAcquireContextW in lib/Support/Windows/Path.inc. # advapi32 required for CryptAcquireContextW in lib/Support/Windows/Path.inc.
set(system_libs ${system_libs} psapi shell32 ole32 uuid advapi32) set(system_libs ${system_libs} psapi shell32 ole32 uuid advapi32)
elseif( CMAKE_HOST_UNIX ) elseif( CMAKE_HOST_UNIX )
▲ Show 20 Lines • Show All 216 Lines • Show Last 20 Lines