diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2ff40962..bab4a9492 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,8 @@ Released ...
 
 Summary: TODO
 
+- Dropped support for Sun compiler
+
 - Upgraded unifont to `unifont-6.3.20131020`
 
 - CSV Plugin: added the ability to pass an `extent` in options
diff --git a/SConstruct b/SConstruct
index ac5780c43..3765c7033 100644
--- a/SConstruct
+++ b/SConstruct
@@ -430,7 +430,6 @@ pickle_store = [# Scons internal variables
         'BOOST_APPEND',
         'LIBDIR_SCHEMA',
         'REQUESTED_PLUGINS',
-        'SUNCC',
         'PYTHON_VERSION',
         'PYTHON_INCLUDES',
         'PYTHON_INSTALL_LOCATION',
@@ -1143,21 +1142,6 @@ if not preconfigured:
         thread_suffix = ''
         env.Append(LIBS = 'pthread')
 
-    # Solaris & Sun Studio settings (the `SUNCC` flag will only be
-    # set if the `CXX` option begins with `CC`)
-    SOLARIS = env['PLATFORM'] == 'SunOS'
-    env['SUNCC'] = SOLARIS and env['CXX'].startswith('CC')
-
-    # If the Sun Studio C++ compiler (`CC`) is used instead of gcc.
-    if env['SUNCC']:
-        env['CC'] = 'cc'
-        # To be compatible w/Boost everything needs to be compiled
-        # with the `-library=stlport4` flag (which needs to come
-        # before the `-o` flag).
-        env['CXX'] = 'CC -library=stlport4'
-        if env['THREADING'] == 'multi':
-            env.Append(CXXFLAGS = '-mt')
-
     if env['SHAPE_MEMORY_MAPPED_FILE']:
         env.Append(CPPDEFINES = '-DSHAPE_MEMORY_MAPPED_FILE')
 
@@ -1734,22 +1718,22 @@ if not preconfigured:
         else:
             env.Append(CPPDEFINES = ndebug_defines)
 
-        if not env['SUNCC']:
-            # Common flags for CXX compiler.
-            common_cxx_flags = '-Wall %s %s -ftemplate-depth-300 ' % (env['WARNING_CXXFLAGS'], pthread)
+        # Common flags for g++/clang++ CXX compiler.
+        # -Wsign-conversion -Wconversion -Wunused-parameter
+        common_cxx_flags = '-Wall -Wsign-compare -Wshadow -Wconversion -Wno-sign-conversion %s %s -ftemplate-depth-300 ' % (env['WARNING_CXXFLAGS'], pthread)
 
-            # https://github.com/mapnik/mapnik/issues/1835
-            if sys.platform == 'darwin' and env['CXX'] == 'g++':
-                common_cxx_flags += '-fpermissive '
+        # https://github.com/mapnik/mapnik/issues/1835
+        if sys.platform == 'darwin' and env['CXX'] == 'g++':
+            common_cxx_flags += '-fpermissive '
 
-            if env['DEBUG']:
-                env.Append(CXXFLAGS = common_cxx_flags + '-O0 -fno-inline')
-            else:
-                # TODO - add back -fvisibility-inlines-hidden
-                # https://github.com/mapnik/mapnik/issues/1863
-                env.Append(CXXFLAGS = common_cxx_flags + '-O%s -fno-strict-aliasing -finline-functions -Wno-inline -Wno-parentheses -Wno-char-subscripts' % (env['OPTIMIZATION']))
-            if env['DEBUG_UNDEFINED']:
-                env.Append(CXXFLAGS = '-fsanitize=undefined-trap -fsanitize-undefined-trap-on-error -ftrapv -fwrapv')
+        if env['DEBUG']:
+            env.Append(CXXFLAGS = common_cxx_flags + '-O0 -fno-inline')
+        else:
+            # TODO - add back -fvisibility-inlines-hidden
+            # https://github.com/mapnik/mapnik/issues/1863
+            env.Append(CXXFLAGS = common_cxx_flags + '-O%s -fno-strict-aliasing -finline-functions -Wno-inline -Wno-parentheses -Wno-char-subscripts' % (env['OPTIMIZATION']))
+        if env['DEBUG_UNDEFINED']:
+            env.Append(CXXFLAGS = '-fsanitize=undefined-trap -fsanitize-undefined-trap-on-error -ftrapv -fwrapv')
 
         if 'python' in env['BINDINGS'] or 'python' in env['REQUESTED_PLUGINS']:
             majver, minver = env['PYTHON_VERSION'].split('.')
diff --git a/deps/agg/build.py b/deps/agg/build.py
index f0e8c90f2..acbfcba74 100644
--- a/deps/agg/build.py
+++ b/deps/agg/build.py
@@ -24,9 +24,6 @@ Import('env')
 
 agg_env = env.Clone()
 
-if env['SUNCC']:
-    cxxflags = env['CUSTOM_CXXFLAGS'] + ' -O -KPIC -DNDEBUG'
-else:
-    cxxflags = env['CUSTOM_CXXFLAGS'] + ' -O%s -fPIC -DNDEBUG' % env['OPTIMIZATION']
+cxxflags = env['CUSTOM_CXXFLAGS'] + ' -O%s -fPIC -DNDEBUG' % env['OPTIMIZATION']
 
 agg_env.StaticLibrary('agg', glob('./src/' + '*.cpp'), LIBS=[], CXXFLAGS=cxxflags, LINKFLAGS=env['CUSTOM_LDFLAGS'])
\ No newline at end of file
diff --git a/deps/clipper/build.py b/deps/clipper/build.py
index 1930ea554..2db821dce 100644
--- a/deps/clipper/build.py
+++ b/deps/clipper/build.py
@@ -24,9 +24,6 @@ Import('env')
 
 clipper_env = env.Clone()
 
-if env['SUNCC']:
-    cxxflags = env['CUSTOM_CXXFLAGS'] + ' -O -KPIC -DNDEBUG'
-else:
-    cxxflags = env['CUSTOM_CXXFLAGS'] + ' -O%s -fPIC -DNDEBUG' % env['OPTIMIZATION']
+cxxflags = env['CUSTOM_CXXFLAGS'] + ' -O%s -fPIC -DNDEBUG' % env['OPTIMIZATION']
 
 clipper_env.StaticLibrary('clipper', ['./src/clipper.cpp',], LIBS=[], CXXFLAGS=cxxflags, LINKFLAGS=env['CUSTOM_LDFLAGS'])