follow-up: use VIEWDEPRECATIONS instead of KEEPDEPRECATIONS

This commit is contained in:
nhmall
2024-04-01 15:04:07 -04:00
parent 61252f5c02
commit d0c543748e

View File

@@ -89,9 +89,9 @@ CXX=clang++ -std=gnu++11
# clang-specific follows # clang-specific follows
CLANGGTEQ14 := $(shell expr `$(CC) -dumpversion | cut -f1 -d.` \>= 14) CLANGGTEQ14 := $(shell expr `$(CC) -dumpversion | cut -f1 -d.` \>= 14)
ifeq "$(CLANGGTEQ14)" "1" ifeq "$(CLANGGTEQ14)" "1"
ifneq "$(KEEPDEPRECATIONS)" "1" ifneq "$(VIEWDEPRECATIONS)" "1"
CFLAGS+=-Wno-deprecated-declarations CFLAGS+=-Wno-deprecated-declarations
endif # not KEEPDEPRECATIONS endif # not VIEWDEPRECATIONS
else else
# older versions complain about things newer ones don't without this # older versions complain about things newer ones don't without this
CFLAGS+=-Wno-missing-field-initializers CFLAGS+=-Wno-missing-field-initializers
@@ -118,10 +118,10 @@ GPPGTEQ12 := $(shell expr `$(CXX) -dumpversion | cut -f1 -d.` \>= 12)
ifeq "$(GPPGTEQ9)" "1" ifeq "$(GPPGTEQ9)" "1"
CCXXFLAGS+=-Wformat-overflow CCXXFLAGS+=-Wformat-overflow
ifdef CPLUSPLUS_NEED_DEPSUPPRESS ifdef CPLUSPLUS_NEED_DEPSUPPRESS
ifneq "$(KEEPDEPRECATIONS)" "1" ifneq "$(VIEWDEPRECATIONS)" "1"
CCXXFLAGS+=-Wno-deprecated-copy CCXXFLAGS+=-Wno-deprecated-copy
CCXXFLAGS+=-Wno-deprecated-declarations CCXXFLAGS+=-Wno-deprecated-declarations
endif # not KEEPDEPRECATIONS endif # not VIEWDEPRECATIONS
endif # CPLUSPLUS_NEED_DEPSUPPRESS endif # CPLUSPLUS_NEED_DEPSUPPRESS
endif # g++ version greater than or equal to 9 endif # g++ version greater than or equal to 9
ifeq "$(GPPGTEQ11)" "1" ifeq "$(GPPGTEQ11)" "1"
@@ -153,10 +153,10 @@ ifeq "$(CLANGPPGTEQ14)" "1"
CPLUSPLUS_NEED_DEPSUPPRESS=1 CPLUSPLUS_NEED_DEPSUPPRESS=1
endif endif
ifdef CPLUSPLUS_NEED_DEPSUPPRESS ifdef CPLUSPLUS_NEED_DEPSUPPRESS
ifneq "$(KEEPDEPRECATIONS)" "1" ifneq "$(VIEWDEPRECATIONS)" "1"
CCXXFLAGS+=-Wno-deprecated CCXXFLAGS+=-Wno-deprecated
CCXXFLAGS+=-Wno-deprecated-declarations CCXXFLAGS+=-Wno-deprecated-declarations
endif # not KEEPDEPRECATIONS endif # not VIEWDEPRECATIONS
endif # CPLUSPLUS_NEED_DEPSUPPRESS endif # CPLUSPLUS_NEED_DEPSUPPRESS
# The clang++ linker seems to have trouble linking if the following isn't # The clang++ linker seems to have trouble linking if the following isn't
# included when compiling the C files by clang.. # included when compiling the C files by clang..