Skip to content

Commit

Permalink
xwin.Dockerfile: Include winrt headers in MSVC "syroot" search path
Browse files Browse the repository at this point in the history
Certain projects might be using headers from the `winrt` portion of the
Windows SDK, in one of our cases a library that uses `wrl/client.h` for
"smart" ComPtr wrappers.  Make these headers available via `/imsvc`,
while `winrt` also seems to be the only remaining yet-unused folder from
`sdk/include/*`.
  • Loading branch information
MarijnS95 committed May 17, 2024
1 parent a71bd89 commit 7916c89
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion xwin.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ ENV CC_x86_64_pc_windows_msvc="clang-cl" \
# Note that we only disable unused-command-line-argument here since clang-cl
# doesn't implement all of the options supported by cl, but the ones it doesn't
# are _generally_ not interesting.
CL_FLAGS="-Wno-unused-command-line-argument -fuse-ld=lld-link /imsvc/xwin/crt/include /imsvc/xwin/sdk/include/ucrt /imsvc/xwin/sdk/include/um /imsvc/xwin/sdk/include/shared" \
CL_FLAGS="-Wno-unused-command-line-argument -fuse-ld=lld-link /imsvc/xwin/crt/include /imsvc/xwin/sdk/include/ucrt /imsvc/xwin/sdk/include/um /imsvc/xwin/sdk/include/shared /imsvc/xwin/sdk/include/winrt" \
# Let cargo know what linker to invoke if you haven't already specified it
# in a .cargo/config.toml file
CARGO_TARGET_X86_64_PC_WINDOWS_MSVC_LINKER="lld-link" \
Expand Down

0 comments on commit 7916c89

Please sign in to comment.