| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 1 | From 9fdf50d63df08ee65e7d8e62c35f19ac4841bca9 Mon Sep 17 00:00:00 2001 |
| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2 | From: Roy Li <rongqing.li@windriver.com> |
| 3 | Date: Wed, 27 May 2015 09:48:45 +0800 |
| 4 | Subject: [PATCH] remove Wsuggest-attribute from CXXFLAGS |
| 5 | |
| 6 | Upstream-Status: Inappropriate |
| 7 | |
| 8 | Wsuggest-attribute is GCC 4.6 feature, centos6 is using GCC |
| 9 | 4.4.7 which unknown this flag, so remove it from CXXFLAGS |
| 10 | |
| 11 | Signed-off-by: Roy Li <rongqing.li@windriver.com> |
| 12 | --- |
| 13 | buildlib/environment.mak.in | 1 - |
| 14 | test/libapt/makefile | 1 - |
| 15 | 2 files changed, 2 deletions(-) |
| 16 | |
| 17 | diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in |
| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 18 | index 9620722..c344d01 100644 |
| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 19 | --- a/buildlib/environment.mak.in |
| 20 | +++ b/buildlib/environment.mak.in |
| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 21 | @@ -14,7 +14,6 @@ CXXFLAGS+= @CXXFLAGS@ -Wall -Wextra |
| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 22 | CXXFLAGS+= -Wcast-align -Wlogical-op -Wredundant-decls -Wmissing-declarations -Wunsafe-loop-optimizations |
| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 23 | CXXFLAGS+= -Wctor-dtor-privacy -Wdisabled-optimization -Winit-self -Wmissing-include-dirs -Wnoexcept -Wsign-promo -Wundef |
| 24 | # suggests methods which already have such an attribute |
| 25 | -#CXXFLAGS+= -Wsuggest-attribute=pure -Wsuggest-attribute=const -Wsuggest-attribute=noreturn |
| 26 | # sanitize options to be enabled for testing |
| 27 | #CXXFLAGS+= -fsanitize=address -fsanitize=undefined -fno-sanitize=vptr |
| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 28 | # a bit too pedantic to be run by default |
| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 29 | diff --git a/test/libapt/makefile b/test/libapt/makefile |
| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 30 | index 5ff9cf6..c5b5190 100644 |
| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 31 | --- a/test/libapt/makefile |
| 32 | +++ b/test/libapt/makefile |
| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 33 | @@ -40,7 +40,6 @@ CXXFLAGS += -pthread |
| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 34 | # disable some flags for gtest again |
| 35 | CXXFLAGS+= -Wno-missing-declarations |
| 36 | CXXFLAGS+= -Wno-missing-field-initializers |
| 37 | -CXXFLAGS+= -Wno-suggest-attribute=pure -Wno-suggest-attribute=const -Wno-suggest-attribute=noreturn |
| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 38 | CXXFLAGS+= -Wno-undef |
| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 39 | |
| 40 | # All Google Test headers. Usually you shouldn't change this definition. |
| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 41 | -- |
| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 42 | 2.1.4 |
| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 43 | |