github/falco
1
0
Fork 0
mirror of https://github.com/falcosecurity/falco.git synced 2025-07-04 10:26:40 +00:00
Code Issues Projects Releases Wiki Activity

fix(cmake/modules): no need of LDFLAGS=-static for gRPC cmake

Browse Source 
Co-authored-by: Lorenzo Fontana <lo@linux.com>
Signed-off-by: Leonardo Di Donato <leodidonato@gmail.com>
This commit is contained in:
Leonardo Di Donato 2020-01-20 22:03:14 +00:00 committed by poiana
parent 55364405aa
commit 6ab27683fa
2 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/modules/gRPC.cmake
View File

@ -107,10 +107,8 @@ else()
BUILD_BYPRODUCTS ${GRPC_LIB} ${GRPCPP_LIB} BUILD_BYPRODUCTS ${GRPC_LIB} ${GRPCPP_LIB}
INSTALL_COMMAND "" INSTALL_COMMAND ""
CONFIGURE_COMMAND "" CONFIGURE_COMMAND ""
PATCH_COMMAND patch -p1 < ${PROJECT_SOURCE_DIR}/cmake/patch/grpc-1.25.0-Makefile.patch
BUILD_COMMAND BUILD_COMMAND
CFLAGS=-Wno-implicit-fallthrough CFLAGS=-Wno-implicit-fallthrough
LDFLAGS=-static
HAS_SYSTEM_ZLIB=false HAS_SYSTEM_ZLIB=false
HAS_SYSTEM_PROTOBUF=false HAS_SYSTEM_PROTOBUF=false
HAS_SYSTEM_CARES=false HAS_SYSTEM_CARES=false

24
cmake/patch/grpc-1.25.0-Makefile.patch
View File

@ -1,24 +0,0 @@
diff --git a/Makefile b/Makefile
index 8fd7044dd9..428da4c6c5 100644
--- a/Makefile
+++ b/Makefile
@@ -852,6 +852,7 @@ ifneq ($(LDFLAGS_PROTOBUF_PKG_CONFIG),)
LDFLAGS_PROTOBUF_PKG_CONFIG += $(shell $(PKG_CONFIG) --libs-only-L protobuf | sed s/L/Wl,-rpath,/)
endif
endif
+LDFLAGS := $(LDFLAGS_PROTOBUF_PKG_CONFIG) $(LDFLAGS)
else
PC_LIBS_GRPCXX = -lprotobuf
endif
diff --git a/templates/Makefile.template b/templates/Makefile.template
index 8063bd4771..eac629d1c7 100644
--- a/templates/Makefile.template
+++ b/templates/Makefile.template
@@ -749,6 +749,7 @@
LDFLAGS_PROTOBUF_PKG_CONFIG += $(shell $(PKG_CONFIG) --libs-only-L protobuf | sed s/L/Wl,-rpath,/)
endif
endif
+ LDFLAGS := $(LDFLAGS_PROTOBUF_PKG_CONFIG) $(LDFLAGS)
else
PC_LIBS_GRPCXX = -lprotobuf
endif