Fix re2 compilation when older system version installed

re2 previously failed to compile if: 1. An old `re2` version is installed with a non-standard system prefix, such as `/opt/local`. 2. The environment variable is set: `CPPFLAGS=-I/opt/local/include`. Running `make` would result in function prototype mismatches because the Makefile would previously attempt to use the headers from `/opt/local/include/re2` before the `third_party/re2/re2` directory. To ensure the current directories receive priority, include the relevant re2 directories in the include path.
grpc · Mar 9, 2023 · 37a6ff0 · 37a6ff0
1 parent 7b3977e
commit 37a6ff0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/Makefile b/Makefile
diff --git a/templates/Makefile.template b/templates/Makefile.template
@@ -445,6 +445,7 @@
   RE2_DEP = $(LIBDIR)/$(CONFIG)/libre2.a
   RE2_MERGE_OBJS = $(LIBRE2_OBJS)
   RE2_MERGE_LIBS = $(LIBDIR)/$(CONFIG)/libre2.a
+  CPPFLAGS := -Ithird_party/re2 $(CPPFLAGS)
 
   # Setup upb dependency