| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame^] | 1 | From 2bff7ee06a4f96e7d326991d61fb86f8aa651d48 Mon Sep 17 00:00:00 2001 |
| 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 |
| 18 | index b0a8d9d..91ed011 100644 |
| 19 | --- a/buildlib/environment.mak.in |
| 20 | +++ b/buildlib/environment.mak.in |
| 21 | @@ -11,7 +11,6 @@ CPPFLAGS+= @CPPFLAGS@ @DEFS@ -D_REENTRANT -D_FORTIFY_SOURCE=2 |
| 22 | CXX = @CXX@ |
| 23 | CXXFLAGS+= @CXXFLAGS@ -Wall -Wextra |
| 24 | CXXFLAGS+= -Wcast-align -Wlogical-op -Wredundant-decls -Wmissing-declarations -Wunsafe-loop-optimizations |
| 25 | -CXXFLAGS+= -Wsuggest-attribute=pure -Wsuggest-attribute=const -Wsuggest-attribute=noreturn |
| 26 | # a bit too pedantic to be run by default |
| 27 | #CXXFLAGS+= -Wpedantic -Wno-long-long -Wno-vla -Wno-variadic-macros |
| 28 | NUM_PROCS = @NUM_PROCS@ |
| 29 | diff --git a/test/libapt/makefile b/test/libapt/makefile |
| 30 | index 7f23ace..e805f13 100644 |
| 31 | --- a/test/libapt/makefile |
| 32 | +++ b/test/libapt/makefile |
| 33 | @@ -39,7 +39,6 @@ CXXFLAGS += -pthread |
| 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 |
| 38 | |
| 39 | # All Google Test headers. Usually you shouldn't change this definition. |
| 40 | GTEST_HEADERS = /usr/include/gtest/*.h \ |
| 41 | -- |
| 42 | 1.9.1 |
| 43 | |