This is an automated email from the ASF dual-hosted git repository.
jamesge pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-brpc.git
The following commit(s) were added to refs/heads/master by this push:
new d7be1d9c add CXXFLAGS in compiling protoc-gen-mcpack
d7be1d9c is described below
commit d7be1d9cf90687c687c778e522fa9da79b7824ee
Author: jamesge <[email protected]>
AuthorDate: Wed Jun 29 09:27:35 2022 +0800
add CXXFLAGS in compiling protoc-gen-mcpack
---
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index e2e1a6b2..3d5978d4 100644
--- a/Makefile
+++ b/Makefile
@@ -241,9 +241,9 @@ clean_debug:
protoc-gen-mcpack: src/idl_options.pb.cc src/mcpack2pb/generator.o libbrpc.a
@echo "> Linking $@"
ifeq ($(SYSTEM),Linux)
- $(CXX) -o $@ $(HDRPATHS) $(LIBPATHS) -std=c++0x -Xlinker "-(" $^
-Wl,-Bstatic $(STATIC_LINKINGS) -Wl,-Bdynamic -Xlinker "-)" $(DYNAMIC_LINKINGS)
+ $(CXX) -o $@ $(CXXFLAGS) $(HDRPATHS) $(LIBPATHS) -std=c++0x -Xlinker
"-(" $^ -Wl,-Bstatic $(STATIC_LINKINGS) -Wl,-Bdynamic -Xlinker "-)"
$(DYNAMIC_LINKINGS)
else ifeq ($(SYSTEM),Darwin)
- $(CXX) -o $@ $(HDRPATHS) $(LIBPATHS) -std=c++0x $^ $(STATIC_LINKINGS)
$(DYNAMIC_LINKINGS)
+ $(CXX) -o $@ $(CXXFLAGS) $(HDRPATHS) $(LIBPATHS) -std=c++0x $^
$(STATIC_LINKINGS) $(DYNAMIC_LINKINGS)
endif
# force generation of pb headers before compiling to avoid fail-to-import
issues in compiling pb.cc
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
