Browse Source

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.
Tim Burks 9 years ago
parent
commit
fa3c8fb9c8

+ 1 - 7
Examples/Echo/PackageManager/Makefile

@@ -1,14 +1,8 @@
 
-CFLAGS = \
--Xcc -DOPENSSL_NO_ASM \
--Xcc -IPackages/SwiftGRPC-0.1.6/Sources/BoringSSL/include \
--Xcc -IPackages/SwiftGRPC-0.1.6/Sources/CgRPC \
--Xcc -IPackages/SwiftGRPC-0.1.6/Sources/CgRPC/include
-
 LDFLAGS = -Xlinker -lz 
 
 all:
-	swift build -v $(CFLAGS) $(LDFLAGS)
+	swift build -v $(LDFLAGS)
 
 clean :
 	rm -rf Packages

+ 1 - 0
Sources/BoringSSL/include/openssl/base.h

@@ -53,6 +53,7 @@
 #ifndef OPENSSL_HEADER_BASE_H
 #define OPENSSL_HEADER_BASE_H
 
+#define OPENSSL_NO_ASM
 
 /* This file should be the first included by all BoringSSL headers. */
 

+ 1 - 0
Sources/CgRPC/include/grpc

@@ -0,0 +1 @@
+../grpc

+ 5 - 0
Sources/CgRPC/include/module.modulemap

@@ -0,0 +1,5 @@
+module CgRPC {
+    header "CgRPC.h"
+    link "CgRPC"
+    export *
+}

+ 1 - 0
Sources/CgRPC/include/src

@@ -0,0 +1 @@
+../src

+ 1 - 0
Sources/CgRPC/include/third_party

@@ -0,0 +1 @@
+../third_party