Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Parameterize AR properly in the Makefile.

Browse Source
pull/13171/head
Josh Haberman 10 years ago
parent d9485c28ed
commit 7333db596e
1 changed files with 4 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      Makefile

7
Makefile
Unescape View File

@ -46,6 +46,7 @@ UPB_FAIL_WARNINGS?=no
# We are C89/C++98, with the one exception that we need stdint and "long long." # We are C89/C++98, with the one exception that we need stdint and "long long."
CC?=cc CC?=cc
CXX?=c++ CXX?=c++
AR?=ar
CFLAGS= CFLAGS=
CXXFLAGS= CXXFLAGS=
INCLUDE=-I. INCLUDE=-I.
@ -221,11 +222,11 @@ endif
$(UPB_PICLIBS): lib/lib%_pic.a: $(call make_objs,lo) $(UPB_PICLIBS): lib/lib%_pic.a: $(call make_objs,lo)
$(E) AR $@ $(E) AR $@
$(Q) mkdir -p lib && ar rcs $@ $^ $(Q) mkdir -p lib && $(AR) rcs $@ $^
$(UPB_LIBS): lib/lib%.a: $(call make_objs,o) $(UPB_LIBS): lib/lib%.a: $(call make_objs,o)
$(E) AR $@ $(E) AR $@
$(Q) mkdir -p lib && ar rcs $@ $^ $(Q) mkdir -p lib && $(AR) rcs $@ $^
obj/upb/%.o: upb/%.c | $$(@D)/. obj/upb/%.o: upb/%.c | $$(@D)/.
@ -370,7 +371,7 @@ googlepbtests: googlepb $(GOOGLEPB_TESTS)
lib/libupb.bindings.googlepb.a: $(upb_bindings_googlepb_SRCS:upb/%.cc=obj/upb/%.o) lib/libupb.bindings.googlepb.a: $(upb_bindings_googlepb_SRCS:upb/%.cc=obj/upb/%.o)
$(E) AR $@ $(E) AR $@
$(Q) mkdir -p lib && ar rcs $@ $^ $(Q) mkdir -p lib && $(AR) rcs $@ $^
# Generate C++ with Google's protobuf compiler, to test and benchmark against. # Generate C++ with Google's protobuf compiler, to test and benchmark against.
tests/google_messages.proto.pb: tests/google_messages.proto tests/google_messages.proto.pb: tests/google_messages.proto

Write Preview
Loading…
Cancel
Save