diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2018-06-23 10:22:49 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2018-06-23 10:22:49 +0200 |
| commit | c6ed823ef7f1b1b4254110aef5f0a30bf101fe4a (patch) | |
| tree | 7946fd7f2f0032b9164543221c191898ec5f964f | |
| parent | fae0d95d2b48e9cdc9810ac90586251fcc8c548b (diff) | |
+ -> X
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | build.yaml | 2 | ||||
| -rw-r--r-- | templates/Makefile.template | 2 |
3 files changed, 8 insertions, 8 deletions
@@ -318,11 +318,11 @@ ifeq ($(HAS_WORKING_NO_SHIFT_NEGATIVE_VALUE),true) W_NO_SHIFT_NEGATIVE_VALUE=-Wno-shift-negative-value NO_W_NO_SHIFT_NEGATIVE_VALUE=-Wshift-negative-value endif -CHECK_NO_C++14_COMPAT_WORKS_CMD = $(CC) -std=c99 -Werror -Wno-c++14-compat -o $(TMPOUT) -c test/build/no-c++14-compat.c -HAS_WORKING_NO_C++14_COMPAT = $(shell $(CHECK_NO_C++14_COMPAT_WORKS_CMD) 2> /dev/null && echo true || echo false) -ifeq ($(HAS_WORKING_NO_C++14_COMPAT),true) -W_NO_C++14_COMPAT=-Wno-c++14-compat -NO_W_NO_C++14_COMPAT=-Wc++14-compat +CHECK_NO_CXX14_COMPAT_WORKS_CMD = $(CC) -std=c99 -Werror -Wno-c++14-compat -o $(TMPOUT) -c test/build/no-c++14-compat.c +HAS_WORKING_NO_CXX14_COMPAT = $(shell $(CHECK_NO_CXX14_COMPAT_WORKS_CMD) 2> /dev/null && echo true || echo false) +ifeq ($(HAS_WORKING_NO_CXX14_COMPAT),true) +W_NO_CXX14_COMPAT=-Wno-c++14-compat +NO_W_NO_CXX14_COMPAT=-Wc++14-compat endif CHECK_NO_UNUSED_BUT_SET_VARIABLE_WORKS_CMD = $(CC) -std=c99 -Werror -Wno-unused-but-set-variable -o $(TMPOUT) -c test/build/no-unused-but-set-variable.c HAS_WORKING_NO_UNUSED_BUT_SET_VARIABLE = $(shell $(CHECK_NO_UNUSED_BUT_SET_VARIABLE_WORKS_CMD) 2> /dev/null && echo true || echo false) @@ -3202,7 +3202,7 @@ PUBLIC_HEADERS_C += \ LIBCXXABI_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBCXXABI_SRC)))) -$(LIBCXXABI_OBJS): CPPFLAGS += -D_LIBCPP_DISABLE_EXTERN_TEMPLATE -D_LIBCXXABI_BUILDING_LIBRARY -D_LIBCXXABI_NO_EXCEPTIONS -Ithird_party/libcxxabi/include -nostdinc++ -Ithird_party/libcxx/include $(W_NO_UNUSED_BUT_SET_VARIABLE) $(W_NO_C++14_COMPAT) -fvisibility=hidden +$(LIBCXXABI_OBJS): CPPFLAGS += -D_LIBCPP_DISABLE_EXTERN_TEMPLATE -D_LIBCXXABI_BUILDING_LIBRARY -D_LIBCXXABI_NO_EXCEPTIONS -Ithird_party/libcxxabi/include -nostdinc++ -Ithird_party/libcxx/include $(W_NO_UNUSED_BUT_SET_VARIABLE) $(W_NO_CXX14_COMPAT) -fvisibility=hidden $(LIBDIR)/$(CONFIG)/libcxxabi.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBCXXABI_OBJS) $(E) "[AR] Creating $@" diff --git a/build.yaml b/build.yaml index 490d479269..30722b4b87 100644 --- a/build.yaml +++ b/build.yaml @@ -5637,7 +5637,7 @@ defaults: cxxabi: CPPFLAGS: -D_LIBCPP_DISABLE_EXTERN_TEMPLATE -D_LIBCXXABI_BUILDING_LIBRARY -D_LIBCXXABI_NO_EXCEPTIONS -Ithird_party/libcxxabi/include -nostdinc++ -Ithird_party/libcxx/include $(W_NO_UNUSED_BUT_SET_VARIABLE) - $(W_NO_C++14_COMPAT) -fvisibility=hidden + $(W_NO_CXX14_COMPAT) -fvisibility=hidden global: COREFLAGS: -fno-rtti -fno-exceptions CPPFLAGS: -g -Wall -Wextra -Werror -Wno-long-long -Wno-unused-parameter -DOSATOMIC_USE_INLINED=1 diff --git a/templates/Makefile.template b/templates/Makefile.template index 8082ca9afb..afab229fae 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -40,7 +40,7 @@ CHECK_WARNINGS=PREFERRED_WARNINGS + ['no-shift-negative-value', 'no-c++14-compat', 'no-unused-but-set-variable'] def warning_var(fmt, warning): - return fmt % warning.replace('-', '_').upper() + return fmt % warning.replace('-', '_').replace('+', 'X').upper() def neg_warning(warning): if warning[0:3] == 'no-': |