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

Merge pull request #19840 from nicolasnoble/fix-include-path-for-upb

Browse Source 
Adding src/core/ext/upb-generated in our include path.
pull/19748/head
Juanli Shen 5 years ago committed by GitHub
parent 73a3ff8804 d5191a5f8b
commit 185ab84528
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 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. 2
      Makefile
  2. 2
      templates/Makefile.template

2
Makefile
Unescape View File

@ -370,7 +370,7 @@ CPPFLAGS += -fPIC
LDFLAGS += -fPIC LDFLAGS += -fPIC
endif endif
INCLUDES = . include $(GENDIR) third_party/upb third_party/upb/generated_for_cmake INCLUDES = . include $(GENDIR) third_party/upb third_party/upb/generated_for_cmake src/core/ext/upb-generated
LDFLAGS += -Llibs/$(CONFIG) LDFLAGS += -Llibs/$(CONFIG)
ifeq ($(SYSTEM),Darwin) ifeq ($(SYSTEM),Darwin)

2
templates/Makefile.template
Unescape View File

@ -240,7 +240,7 @@
LDFLAGS += -fPIC LDFLAGS += -fPIC
endif endif
INCLUDES = . include $(GENDIR) third_party/upb third_party/upb/generated_for_cmake INCLUDES = . include $(GENDIR) third_party/upb third_party/upb/generated_for_cmake src/core/ext/upb-generated
LDFLAGS += -Llibs/$(CONFIG) LDFLAGS += -Llibs/$(CONFIG)
ifeq ($(SYSTEM),Darwin) ifeq ($(SYSTEM),Darwin)

Write Preview
Loading…
Cancel
Save