Browse Source

Move another compiler directive into vendor-grpc.sh.

Daniel Alm 7 years ago
parent
commit
03f43093fb
3 changed files with 4 additions and 2 deletions
  1. 0 1
      Makefile
  2. 1 1
      Sources/CgRPC/src/core/tsi/ssl_transport_security.cc
  3. 3 0
      vendor-grpc.sh

+ 0 - 1
Makefile

@@ -1,7 +1,6 @@
 UNAME_S = $(shell uname -s)
 
 ifeq ($(UNAME_S),Linux)
-  CFLAGS = -Xcc -DTSI_OPENSSL_ALPN_SUPPORT=0
 else
   CFLAGS = -Xcc -ISources/BoringSSL/include
 endif

+ 1 - 1
Sources/CgRPC/src/core/tsi/ssl_transport_security.cc

@@ -62,7 +62,7 @@ extern "C" {
    bad practice.
    TODO(jboeuf): refactor all the #if / #endif in a separate module. */
 #ifndef TSI_OPENSSL_ALPN_SUPPORT
-#define TSI_OPENSSL_ALPN_SUPPORT 1
+#define TSI_OPENSSL_ALPN_SUPPORT 0
 #endif
 
 /* TODO(jboeuf): I have not found a way to get this number dynamically from the

+ 3 - 0
vendor-grpc.sh

@@ -75,6 +75,9 @@ cp third_party/grpc/third_party/nanopb/*.h Sources/CgRPC/third_party/nanopb/
 echo "ADDING additional compiler flags to nanopb/pb.h"
 perl -pi -e 's/\/\* #define PB_FIELD_16BIT 1 \*\//#define PB_FIELD_16BIT 1/' Sources/CgRPC/third_party/nanopb/pb.h
 
+echo "ADDING additional compiler flags to tsi/ssl_transport_security.cc"
+perl -pi -e 's/#define TSI_OPENSSL_ALPN_SUPPORT 1/#define TSI_OPENSSL_ALPN_SUPPORT 0/' Sources/CgRPC/src/core/tsi/ssl_transport_security.cc
+
 echo "DISABLING ARES"
 perl -pi -e 's/#define GRPC_ARES 1/#define GRPC_ARES 0/' Sources/CgRPC/include/grpc/impl/codegen/port_platform.h