Skip to content

Commit c7e158c

Browse files
authored
Merge pull request swiftlang#819 from swiftwasm/master
[pull] swiftwasm from master
2 parents 79bf370 + debc627 commit c7e158c

File tree

4 files changed

+19
-3
lines changed

4 files changed

+19
-3
lines changed

stdlib/public/Platform/winsdk.modulemap

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,5 +216,13 @@ module WinSDK [system] {
216216

217217
link "AdvAPI32.Lib"
218218
}
219+
220+
module WinRPC {
221+
header "../shared/rpc.h"
222+
header "../shared/rpcndr.h"
223+
export *
224+
225+
link "RpcRT4.Lib"
226+
}
219227
}
220228

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
// RUN: %empty-directory(%t)
2-
// RUN: %target-build-swift -working-directory %t -I%t -parse-as-library -emit-module -module-name module1 -emit-module-path %t/module1.swiftmodule -emit-library -static %S/Inputs/cross_module_derivative_attr/module1/module1.swift %S/Inputs/cross_module_derivative_attr/module1/module1_other_file.swift -Xfrontend -validate-tbd-against-ir=none
3-
// RUN: %target-build-swift -I%t -L%t %S/Inputs/cross_module_derivative_attr/main/main.swift -o %t/a.out -lm -lmodule1 -Xfrontend -validate-tbd-against-ir=none
4-
// RUN: %target-run %t/a.out
2+
// RUN: %target-build-swift-dylib(%t/%target-library-name(module1)) %S/Inputs/cross_module_derivative_attr/module1/module1.swift %S/Inputs/cross_module_derivative_attr/module1/module1_other_file.swift -emit-module -emit-module-path %t/module1.swiftmodule -module-name module1
3+
// -Xfrontend -validate-tbd-against-ir=none
4+
// RUN: %target-build-swift -I%t -L%t %S/Inputs/cross_module_derivative_attr/main/main.swift -o %t/a.out -lmodule1 %target-rpath(%t)
5+
// -Xfrontend -validate-tbd-against-ir=none
6+
// RUN: %target-codesign %t/a.out
7+
// RUN: %target-codesign %t/%target-library-name(module1)
8+
// RUN: %target-run %t/a.out %t/%target-library-name(module1)
59
// REQUIRES: executable_test

test/AutoDiff/validation-test/custom_derivatives.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import StdlibUnittest
55
#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
66
import Darwin.C
7+
#elseif os(Windows)
8+
import ucrt
79
#else
810
import Glibc
911
#endif

test/AutoDiff/validation-test/separate_tangent_type.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import StdlibUnittest
55
#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
66
import Darwin.C
7+
#elseif os(Windows)
8+
import ucrt
79
#else
810
import Glibc
911
#endif

0 commit comments

Comments
 (0)