diff options
| author | van Hauser <vh@thc.org> | 2023-08-01 09:55:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-01 09:55:10 +0200 |
| commit | 0265b39c138e1451accc048d3442a1e15d7ae86c (patch) | |
| tree | 6874ae802a5df27c0ce3029feafa1525f3c0bfc8 | |
| parent | f75c4303654602442987b9a653e5ad3af4974b43 (diff) | |
| parent | 82635dc6569d84899147b2487f19ebe3eaee92b2 (diff) | |
| download | afl++-0265b39c138e1451accc048d3442a1e15d7ae86c.tar.gz | |
Merge pull request #1819 from jschwartzentruber/cxx-use-cppflags
C++ compilation should use CPPFLAGS
| -rw-r--r-- | GNUmakefile.gcc_plugin | 2 | ||||
| -rw-r--r-- | GNUmakefile.llvm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/GNUmakefile.gcc_plugin b/GNUmakefile.gcc_plugin index 29d0ed9d..a90b02ea 100644 --- a/GNUmakefile.gcc_plugin +++ b/GNUmakefile.gcc_plugin @@ -38,7 +38,7 @@ override CFLAGS += $(CFLAGS_SAFE) CXXFLAGS ?= -O3 -g -funroll-loops # -D_FORTIFY_SOURCE=1 -CXXEFLAGS := $(CXXFLAGS) -Wall -std=c++11 +CXXEFLAGS := $(CXXFLAGS) $(CPPFLAGS) -Wall -std=c++11 CC ?= gcc CXX ?= g++ diff --git a/GNUmakefile.llvm b/GNUmakefile.llvm index 75fb664b..d8c47ccc 100644 --- a/GNUmakefile.llvm +++ b/GNUmakefile.llvm @@ -300,7 +300,7 @@ endif ifneq "$(LLVM_CONFIG)" "" CLANG_CFL += -I$(shell dirname $(LLVM_CONFIG))/../include endif -CLANG_CPPFL = `$(LLVM_CONFIG) --cxxflags` -fno-rtti -fPIC $(CXXFLAGS) -Wno-deprecated-declarations +CLANG_CPPFL = `$(LLVM_CONFIG) --cxxflags` -fno-rtti -fPIC $(CXXFLAGS) $(CPPFLAGS) -Wno-deprecated-declarations CLANG_LFL = `$(LLVM_CONFIG) --ldflags` $(LDFLAGS) # wasm fuzzing: disable thread-local storage and unset LLVM debug flag |