Take CPPFLAGS and CXXFLAGS in account in Makefiles

google · Sep 27, 2023 · a7e00a9 · a7e00a9
1 parent bae1cf6
commit a7e00a9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -23,7 +23,7 @@ PKG_CONFIG ?= pkg-config
 DEPS = fuse libzip icu-uc icu-i18n
 LIBS := -Llib -lfusezip $(shell $(PKG_CONFIG) --libs $(DEPS))
 LIBS += -Llib -lfusezip
-CXXFLAGS := $(shell $(PKG_CONFIG) --cflags $(DEPS))
+CXXFLAGS += $(shell $(PKG_CONFIG) --cflags $(DEPS))
 CXXFLAGS += -Wall -Wextra -Wno-sign-compare -Wno-missing-field-initializers -pedantic -std=c++20
 ifeq ($(DEBUG), 1)
 CXXFLAGS += -O0 -g

diff --git a/lib/Makefile b/lib/Makefile
@@ -18,7 +18,7 @@
 DEST = libfusezip.a
 PKG_CONFIG ?= pkg-config
 DEPS = fuse libzip icu-uc icu-i18n
-CXXFLAGS := $(shell $(PKG_CONFIG) --cflags $(DEPS))
+CXXFLAGS += $(shell $(PKG_CONFIG) --cflags $(DEPS))
 CXXFLAGS += -Wall -Wextra -Wno-sign-compare -Wno-missing-field-initializers -pedantic -std=c++20
 ifeq ($(DEBUG), 1)
 CXXFLAGS += -O0 -g
@@ -38,7 +38,7 @@ $(DEST): $(OBJECTS)
 	$(AR) -cr $@ $(OBJECTS)
 
 .cc.o:
-	$(CXX) -c $(CXXFLAGS) $< -o $@
+	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@
 
 clean:
 	rm -f $(DEST) $(OBJECTS)