Move -I../inst/include to PKG_CPPFLAGS

ms609 · ms609 · commit a5c20c13c6c0 · 2026-03-22T20:44:29.000Z
PKG_CXXFLAGS is overridden by ASAN/ubsan ~/.R/Makevars on CI,
dropping the inst/include path.  PKG_CPPFLAGS is not overridden.
diff --git a/src/Makevars b/src/Makevars
@@ -1,2 +1,3 @@
-PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS) -I../inst/include
+PKG_CPPFLAGS = -I../inst/include
+PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS)
 PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS)
diff --git a/src/Makevars.win b/src/Makevars.win
@@ -1,2 +1,3 @@
-PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS) -I../inst/include
+PKG_CPPFLAGS = -I../inst/include
+PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS)
 PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS)
