From 5ddbb02ccd9cd477a8cb29740cc8166e680fa60b Mon Sep 17 00:00:00 2001 From: Richard Belleville Date: Mon, 8 Jan 2024 16:02:40 -0800 Subject: [PATCH] Another path --- Makefile | 2 +- build_handwritten.yaml | 2 +- grpc.gyp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index fd63876a051..5e14871a0d3 100644 --- a/Makefile +++ b/Makefile @@ -328,7 +328,7 @@ CXXFLAGS += -stdlib=libc++ LDFLAGS += -framework CoreFoundation endif CFLAGS += -g -CPPFLAGS += -g -Wall -Wextra -DOSATOMIC_USE_INLINED=1 -Ithird_party/abseil-cpp -Ithird_party/re2 -Ithird_party/protobuf -Isrc/core/ext/upb-gen -Isrc/core/ext/upbdefs-gen -Ithird_party/utf8_range -Ithird_party/xxhash +CPPFLAGS += -g -Wall -Wextra -DOSATOMIC_USE_INLINED=1 -Ithird_party/abseil-cpp -Ithird_party/re2 -Ithird_party/protobuf -Isrc/core/ext/upb-gen -Isrc/core/ext/upbdefs-gen -Ithird_party/protobuf/third_party/utf8_range -Ithird_party/xxhash COREFLAGS += -fno-exceptions LDFLAGS += -g diff --git a/build_handwritten.yaml b/build_handwritten.yaml index 437504e36db..692b7b0a086 100644 --- a/build_handwritten.yaml +++ b/build_handwritten.yaml @@ -149,7 +149,7 @@ defaults: CFLAGS: -g COREFLAGS: -fno-exceptions CPPFLAGS: -g -Wall -Wextra -DOSATOMIC_USE_INLINED=1 -Ithird_party/abseil-cpp -Ithird_party/re2 - -Ithird_party/protobuf -Isrc/core/ext/upb-gen -Isrc/core/ext/upbdefs-gen -Ithird_party/utf8_range + -Ithird_party/protobuf -Isrc/core/ext/upb-gen -Isrc/core/ext/upbdefs-gen -Ithird_party/protobuf/third_party/utf8_range -Ithird_party/xxhash LDFLAGS: -g zlib: diff --git a/grpc.gyp b/grpc.gyp index 65b03b1afe6..154b3ac6463 100644 --- a/grpc.gyp +++ b/grpc.gyp @@ -60,7 +60,7 @@ '-Ithird_party/protobuf', '-Isrc/core/ext/upb-gen', '-Isrc/core/ext/upbdefs-gen', - '-Ithird_party/utf8_range', + '-Ithird_party/protobuf/third_party/utf8_range', '-Ithird_party/xxhash', ], 'ldflags': [ @@ -141,7 +141,7 @@ '-Ithird_party/protobuf', '-Isrc/core/ext/upb-gen', '-Isrc/core/ext/upbdefs-gen', - '-Ithird_party/utf8_range', + '-Ithird_party/protobuf/third_party/utf8_range', '-Ithird_party/xxhash', ], 'OTHER_CPLUSPLUSFLAGS': [ @@ -154,7 +154,7 @@ '-Ithird_party/protobuf', '-Isrc/core/ext/upb-gen', '-Isrc/core/ext/upbdefs-gen', - '-Ithird_party/utf8_range', + '-Ithird_party/protobuf/third_party/utf8_range', '-Ithird_party/xxhash', '-stdlib=libc++', '-std=c++14',