This is an archive of the discontinued LLVM Phabricator instance.

Differential D82888

[cmake][Windows] Add libpath to CMAKE_MODULE_LINKER_FLAGS too
ClosedPublic

Authored by dmajor on Jun 30 2020, 9:43 AM.

Details

Reviewers
rnk
russell.gallop
thakis
pcc
hans
Commits
rG63eddb679ad0: [cmake][Windows] Add libpath to CMAKE_MODULE_LINKER_FLAGS too
Summary

Followup to b8000c0ce845, the library path needs to go in CMAKE_MODULE_LINKER_FLAGS too, for the sake of a few files like LLVMHello.dll.

Diff Detail

Event Timeline

dmajor created this revision.Jun 30 2020, 9:43 AM
Herald added a project: Restricted Project. · View Herald TranscriptJun 30 2020, 9:43 AM
Herald added subscribers: llvm-commits, mgorny. · View Herald Transcript
dmajor mentioned this in D65543: [Windows] Autolink with basenames and add libdir to libpath.Jun 30 2020, 9:44 AM
Harbormaster failed remote builds in B62353: Diff 274520!Jun 30 2020, 10:50 AM
hans accepted this revision.Jun 30 2020, 12:03 PM

lgtm

This revision is now accepted and ready to land.Jun 30 2020, 12:03 PM
Closed by commit rG63eddb679ad0: [cmake][Windows] Add libpath to CMAKE_MODULE_LINKER_FLAGS too (authored by rojamd <rojamd>). · Explain WhyJul 1 2020, 7:33 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
cmake/
modules/
1 line

Diff 274802

llvm/cmake/modules/HandleLLVMOptions.cmake

Show First 20 Lines • Show All 905 Lines • ▼ Show 20 Lines execute_process(
RESULT_VARIABLE clang_cl_exit_code) RESULT_VARIABLE clang_cl_exit_code)
if (NOT "${clang_cl_exit_code}" STREQUAL "0") if (NOT "${clang_cl_exit_code}" STREQUAL "0")
message(FATAL_ERROR message(FATAL_ERROR
"Unable to invoke clang-cl to find resource dir: ${clang_cl_stderr}") "Unable to invoke clang-cl to find resource dir: ${clang_cl_stderr}")
endif() endif()
file(TO_CMAKE_PATH "${clang_resource_dir}" clang_resource_dir) file(TO_CMAKE_PATH "${clang_resource_dir}" clang_resource_dir)
append("/libpath:${clang_resource_dir}/lib/windows" append("/libpath:${clang_resource_dir}/lib/windows"
CMAKE_EXE_LINKER_FLAGS CMAKE_EXE_LINKER_FLAGS
CMAKE_MODULE_LINKER_FLAGS
CMAKE_SHARED_LINKER_FLAGS) CMAKE_SHARED_LINKER_FLAGS)
endif() endif()
if(LLVM_PROFDATA_FILE AND EXISTS ${LLVM_PROFDATA_FILE}) if(LLVM_PROFDATA_FILE AND EXISTS ${LLVM_PROFDATA_FILE})
if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" ) if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" )
append("-fprofile-instr-use=\"${LLVM_PROFDATA_FILE}\"" append("-fprofile-instr-use=\"${LLVM_PROFDATA_FILE}\""
CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS
CMAKE_C_FLAGS) CMAKE_C_FLAGS)
▲ Show 20 Lines • Show All 172 Lines • Show Last 20 Lines