From dcfa0564138716ac787137ce11e863051c15e272 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Tue, 21 Oct 2014 19:49:03 -0700
Subject: [PATCH] merge

---
 SConstruct | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SConstruct b/SConstruct
index a86566ce1..0c342d9eb 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1742,7 +1742,7 @@ if not preconfigured:
             # TODO - remove when building against >= 1.55
             # https://github.com/mapnik/mapnik/issues/1970
             env.Append(CXXFLAGS = '-Wno-c++11-narrowing')
-        if 'g++' in env['CXX']:
+        elif 'g++' in env['CXX']:
             env.Append(CXXFLAGS = '-Wno-pragmas')
 
         # Enable logging in debug mode (always) and release mode (when specified)