Commit 8d94754e authored by gejun's avatar gejun

Force generation of .pb.h before compiling brpc

parent 83cd59d8
...@@ -279,11 +279,12 @@ protoc-gen-mcpack:src/mcpack2pb/generator.o libmcpack2pb.a libbase.a libbthread. ...@@ -279,11 +279,12 @@ protoc-gen-mcpack:src/mcpack2pb/generator.o libmcpack2pb.a libbase.a libbthread.
@echo "Linking $@" @echo "Linking $@"
@$(CXX) -o $@ $(LIBPATHS) -Xlinker "-(" $^ -Wl,-Bstatic $(STATIC_LINKINGS) -Wl,-Bdynamic -Xlinker "-)" $(DYNAMIC_LINKINGS) @$(CXX) -o $@ $(LIBPATHS) -Xlinker "-(" $^ -Wl,-Bstatic $(STATIC_LINKINGS) -Wl,-Bdynamic -Xlinker "-)" $(DYNAMIC_LINKINGS)
libbrpc.a:$(BRPC_OBJS) # force generation of pb headers before compiling to avoid fail-to-import issues in compiling pb.cc
libbrpc.a:$(BRPC_PROTOS:.proto=.pb.h) $(BRPC_OBJS)
@echo "Packing $@" @echo "Packing $@"
@ar crs $@ $^ @ar crs $@ $^
libbrpc.dbg.a:$(BRPC_DEBUG_OBJS) libbrpc.dbg.a:$(BRPC_PROTOS:.proto=.pb.h) $(BRPC_DEBUG_OBJS)
@echo "Packing $@" @echo "Packing $@"
@ar crs $@ $^ @ar crs $@ $^
......
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