Skip to content

B
brpc
Unverified Commit 3afac97f authored by Ge Jun's avatar Ge Jun Committed by GitHub
Browse files
Options

Merge pull request #545 from choleraehyq/patch-1 

Makefile: fix for high version protobuf
parents 8e7db45f 72160e71
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
Makefile
View file @ 3afac97f
......@@ -223,9 +223,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) -Xlinker "-(" $^ -Wl,-Bstatic $(STATIC_LINKINGS) -Wl,-Bdynamic -Xlinker "-)" $(DYNAMIC_LINKINGS)
@$(CXX) -o $@ $(HDRPATHS) $(LIBPATHS) -std=c++0x -Xlinker "-(" $^ -Wl,-Bstatic $(STATIC_LINKINGS) -Wl,-Bdynamic -Xlinker "-)" $(DYNAMIC_LINKINGS)
else ifeq ($(SYSTEM),Darwin)
@$(CXX) -o $@ $(HDRPATHS) $(LIBPATHS) $^ $(STATIC_LINKINGS) $(DYNAMIC_LINKINGS)
@$(CXX) -o $@ $(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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment