Skip to content

Commit fa3c8fb

Browse files
committed
Structural changes to better support Package Manager builds.
- A #define is added to include/openssl/base.h (this needs to be added to the vendoring script). - links are added to CgRPC/include to point to other directories of include files. - a modulemap is added to CgRPC/include to avoid confusion caused by the new directory links.
1 parent 583b965 commit fa3c8fb

File tree

6 files changed

+10
-7
lines changed

6 files changed

+10
-7
lines changed

Examples/Echo/PackageManager/Makefile

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11

2-
CFLAGS = \
3-
-Xcc -DOPENSSL_NO_ASM \
4-
-Xcc -IPackages/SwiftGRPC-0.1.6/Sources/BoringSSL/include \
5-
-Xcc -IPackages/SwiftGRPC-0.1.6/Sources/CgRPC \
6-
-Xcc -IPackages/SwiftGRPC-0.1.6/Sources/CgRPC/include
7-
82
LDFLAGS = -Xlinker -lz
93

104
all:
11-
swift build -v $(CFLAGS) $(LDFLAGS)
5+
swift build -v $(LDFLAGS)
126

137
clean :
148
rm -rf Packages

Sources/BoringSSL/include/openssl/base.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
#ifndef OPENSSL_HEADER_BASE_H
5454
#define OPENSSL_HEADER_BASE_H
5555

56+
#define OPENSSL_NO_ASM
5657

5758
/* This file should be the first included by all BoringSSL headers. */
5859

Sources/CgRPC/include/grpc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../grpc
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
module CgRPC {
2+
header "CgRPC.h"
3+
link "CgRPC"
4+
export *
5+
}

Sources/CgRPC/include/src

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../src

Sources/CgRPC/include/third_party

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../third_party

0 commit comments

Comments
 (0)