From 95b301deb4e0639943d5132300d9642fa952588a Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Tue, 21 Oct 2014 20:22:33 -0700
Subject: [PATCH] set ignore unknown pragmas after -Wall and -Wextra

---
 SConstruct | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/SConstruct b/SConstruct
index 0c342d9eb..c32d2aef4 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1737,13 +1737,10 @@ if not preconfigured:
         #  - upgrade to PHOENIX_V3 since that is needed for c++11 compile
         env.Append(CPPDEFINES = '-DBOOST_SPIRIT_USE_PHOENIX_V3=1')
         if 'clang++' in env['CXX']:
-            env.Append(CXXFLAGS = '-Wno-unknown-pragmas')
             #  - workaround boost gil channel_algorithm.hpp narrowing error
             # TODO - remove when building against >= 1.55
             # https://github.com/mapnik/mapnik/issues/1970
             env.Append(CXXFLAGS = '-Wno-c++11-narrowing')
-        elif 'g++' in env['CXX']:
-            env.Append(CXXFLAGS = '-Wno-pragmas')
 
         # Enable logging in debug mode (always) and release mode (when specified)
         if env['DEFAULT_LOG_SEVERITY']:
@@ -1786,6 +1783,11 @@ if not preconfigured:
         # TODO: clean up code more to make -Wsign-conversion -Wconversion -Wshadow viable
         common_cxx_flags = '-Wall -Wsign-compare -Wextra %s %s -ftemplate-depth-300 ' % (env['WARNING_CXXFLAGS'], pthread)
 
+        if 'clang++' in env['CXX']:
+            common_cxx_flags += ' -Wno-unknown-pragmas '
+        elif 'g++' in env['CXX']:
+            common_cxx_flags += ' -Wno-pragmas '
+
         if env['DEBUG']:
             env.Append(CXXFLAGS = common_cxx_flags + '-O0')
         else: