@@ -41,7 +41,7 @@ srctree := $(patsubst %/,%,$(dir $(srctree)))
41
41
srctree := $(patsubst % /,% ,$(dir $(srctree ) ) )
42
42
endif
43
43
44
- CFLAGS += -g $(OPT_FLAGS ) -rdynamic \
44
+ CFLAGS += -g $(OPT_FLAGS ) -rdynamic -std=gnu11 \
45
45
-Wall -Werror -fno-omit-frame-pointer \
46
46
$(GENFLAGS ) $(SAN_CFLAGS ) $(LIBELF_CFLAGS ) \
47
47
-I$(CURDIR ) -I$(INCLUDE_DIR ) -I$(GENDIR ) -I$(LIBDIR ) \
@@ -447,6 +447,7 @@ CLANG_SYS_INCLUDES = $(call get_sys_includes,$(CLANG),$(CLANG_TARGET_ARCH))
447
447
BPF_CFLAGS = -g -Wall -Werror -D__TARGET_ARCH_$(SRCARCH ) $(MENDIAN ) \
448
448
-I$(INCLUDE_DIR ) -I$(CURDIR ) -I$(APIDIR ) \
449
449
-I$(abspath $(OUTPUT ) /../usr/include) \
450
+ -std=gnu11 \
450
451
-fno-strict-aliasing \
451
452
-Wno-compare-distinct-pointer-types
452
453
# TODO: enable me -Wsign-compare
@@ -787,9 +788,12 @@ $(OUTPUT)/xdp_features: xdp_features.c $(OUTPUT)/network_helpers.o $(OUTPUT)/xdp
787
788
$(Q )$(CC ) $(CFLAGS ) $(filter % .a % .o % .c,$^ ) $(LDLIBS ) -o $@
788
789
789
790
# Make sure we are able to include and link libbpf against c++.
791
+ CXXFLAGS += $(CFLAGS )
792
+ CXXFLAGS := $(subst -D_GNU_SOURCE=,,$(CXXFLAGS ) )
793
+ CXXFLAGS := $(subst -std=gnu11,-std=gnu++11,$(CXXFLAGS ) )
790
794
$(OUTPUT ) /test_cpp : test_cpp.cpp $(OUTPUT ) /test_core_extern.skel.h $(BPFOBJ )
791
795
$(call msg,CXX,,$@ )
792
- $(Q )$(CXX ) $(subst -D_GNU_SOURCE=,, $( CFLAGS ) ) $(filter % .a % .o % .cpp,$^ ) $(LDLIBS ) -o $@
796
+ $(Q )$(CXX ) $(CXXFLAGS ) $(filter % .a % .o % .cpp,$^ ) $(LDLIBS ) -o $@
793
797
794
798
# Benchmark runner
795
799
$(OUTPUT ) /bench_% .o : benchs/bench_% .c bench.h $(BPFOBJ )
0 commit comments