gamzinav/cling
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Thread.pcm on Windows

Browse Source
This commit is contained in:
Vaibhav Garg 2020-05-23 07:39:26 +00:00 committed by jenkins
parent ad695461b9
commit 807dafd1cb
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/cling/services_msvc.modulemap Normal file
View File

@ -0,0 +1,14 @@
module "services" [system] {
requires windows
export *
module "minwinbase.h" {
export *
textual header "minwinbase.h"
}
module "windows.h" {
export *
header "windows.h"
}
}

3
lib/Interpreter/CIFactory.cpp
View File

@ -560,6 +560,7 @@ namespace {
// We can't use "assert.h" because it is defined in the resource dir, too. // We can't use "assert.h" because it is defined in the resource dir, too.
#ifdef LLVM_ON_WIN32 #ifdef LLVM_ON_WIN32
llvm::SmallString<256> vcIncLoc(getIncludePathForHeader(HS, "vcruntime.h")); llvm::SmallString<256> vcIncLoc(getIncludePathForHeader(HS, "vcruntime.h"));
llvm::SmallString<256> servIncLoc(getIncludePathForHeader(HS, "windows.h"));
#endif #endif
llvm::SmallString<128> cIncLoc(getIncludePathForHeader(HS, "time.h")); llvm::SmallString<128> cIncLoc(getIncludePathForHeader(HS, "time.h"));
@ -651,6 +652,8 @@ namespace {
#ifdef LLVM_ON_WIN32 #ifdef LLVM_ON_WIN32
maybeAppendOverlayEntry(vcIncLoc.str(), "vcruntime.modulemap", maybeAppendOverlayEntry(vcIncLoc.str(), "vcruntime.modulemap",
clingIncLoc.str(), MOverlay); clingIncLoc.str(), MOverlay);
maybeAppendOverlayEntry(servIncLoc.str(), "services_msvc.modulemap",
clingIncLoc.str(), MOverlay);
maybeAppendOverlayEntry(cIncLoc.str(), "libc_msvc.modulemap", maybeAppendOverlayEntry(cIncLoc.str(), "libc_msvc.modulemap",
clingIncLoc.str(), MOverlay); clingIncLoc.str(), MOverlay);
maybeAppendOverlayEntry(stdIncLoc.str(), "std_msvc.modulemap", maybeAppendOverlayEntry(stdIncLoc.str(), "std_msvc.modulemap",