This is an archive of the discontinued LLVM Phabricator instance.

Differential D151946

[CMake] Add /winsysroot to lld-link when LLVM_WINSYSROOT is specified
ClosedPublic

Authored by aeubanks on Jun 1 2023, 3:57 PM.

Details

Reviewers
hans
rnk
Commits
rG9efbb67939bd: [CMake] Add /winsysroot to lld-link when LLVM_WINSYSROOT is specified
Summary

So that the linker can find libraries in the winsysroot.

Diff Detail

Unit TestsFailed

TimeTest
60,030 msx64 debian > MLIR.Examples/standalone::test.toy

Event Timeline

aeubanks created this revision.Jun 1 2023, 3:57 PM
Herald added a project: Restricted Project. · View Herald TranscriptJun 1 2023, 3:57 PM
Herald added a subscriber: ekilmer. · View Herald Transcript
aeubanks requested review of this revision.Jun 1 2023, 3:57 PM
Herald added a project: Restricted Project. · View Herald TranscriptJun 1 2023, 3:57 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
aeubanks added reviewers: hans, rnk.Jun 1 2023, 3:59 PM
rnk accepted this revision.Jun 1 2023, 4:38 PM

Make it so!

This revision is now accepted and ready to land.Jun 1 2023, 4:38 PM
Harbormaster completed remote builds in B236014: Diff 527652.Jun 1 2023, 6:14 PM
hans accepted this revision.Jun 5 2023, 4:16 AM
This revision was landed with ongoing or failed builds.Jul 5 2023, 9:59 AM
Closed by commit rG9efbb67939bd: [CMake] Add /winsysroot to lld-link when LLVM_WINSYSROOT is specified (authored by aeubanks). · Explain Why
This revision was automatically updated to reflect the committed changes.
aeubanks added a commit: rG9efbb67939bd: [CMake] Add /winsysroot to lld-link when LLVM_WINSYSROOT is specified.

Revision Contents

PathSize
llvm/
cmake/
modules/
5 lines

Diff 527652

llvm/cmake/modules/HandleLLVMOptions.cmake

Show First 20 Lines • Show All 484 Lines • ▼ Show 20 Lines add_compile_definitions(
_UNICODE _UNICODE
) )
if (LLVM_WINSYSROOT) if (LLVM_WINSYSROOT)
if (NOT CLANG_CL) if (NOT CLANG_CL)
message(ERROR "LLVM_WINSYSROOT requires clang-cl") message(ERROR "LLVM_WINSYSROOT requires clang-cl")
endif() endif()
append("/winsysroot${LLVM_WINSYSROOT}" CMAKE_C_FLAGS CMAKE_CXX_FLAGS) append("/winsysroot${LLVM_WINSYSROOT}" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
if (LINKER_IS_LLD_LINK)
append("/winsysroot:${LLVM_WINSYSROOT}"
CMAKE_EXE_LINKER_FLAGS CMAKE_MODULE_LINKER_FLAGS
CMAKE_SHARED_LINKER_FLAGS)
endif()
endif() endif()
if (LLVM_ENABLE_WERROR) if (LLVM_ENABLE_WERROR)
append("/WX" CMAKE_C_FLAGS CMAKE_CXX_FLAGS) append("/WX" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
endif (LLVM_ENABLE_WERROR) endif (LLVM_ENABLE_WERROR)
append("/Zc:inline" CMAKE_C_FLAGS CMAKE_CXX_FLAGS) append("/Zc:inline" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
▲ Show 20 Lines • Show All 802 Lines • Show Last 20 Lines