sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use -fpermissive on OS X when g++ is used - closes #1835

Browse source
This commit is contained in:
Dane Springmeyer 2013-05-10 14:16:58 -07:00
parent be7c4f2cd5
commit ca16303871
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
SConstruct
View file

@ -1089,7 +1089,7 @@ if not preconfigured:
SOLARIS = env['PLATFORM'] == 'SunOS' SOLARIS = env['PLATFORM'] == 'SunOS'
env['SUNCC'] = SOLARIS and env['CXX'].startswith('CC') env['SUNCC'] = SOLARIS and env['CXX'].startswith('CC')
# If the Sun Studio C++ compiler (`CC`) is used instead of GCC. # If the Sun Studio C++ compiler (`CC`) is used instead of gcc.
if env['SUNCC']: if env['SUNCC']:
env['CC'] = 'cc' env['CC'] = 'cc'
# To be compatible w/Boost everything needs to be compiled # To be compatible w/Boost everything needs to be compiled
@ -1596,8 +1596,14 @@ if not preconfigured:
env.Append(CPPDEFINES = ndebug_defines) env.Append(CPPDEFINES = ndebug_defines)
if not env['SUNCC']: if not env['SUNCC']:
# Common flags for GCC.
# Common flags for CXX compiler.
common_cxx_flags = '-ansi -Wall %s %s -ftemplate-depth-300 ' % (env['WARNING_CXXFLAGS'], pthread) common_cxx_flags = '-ansi -Wall %s %s -ftemplate-depth-300 ' % (env['WARNING_CXXFLAGS'], pthread)
# https://github.com/mapnik/mapnik/issues/1835
if sys.platform == 'darwin' and 'g++' in env['CXX']:
common_cxx_flags += '-fpermissive '
if env['DEBUG']: if env['DEBUG']:
env.Append(CXXFLAGS = common_cxx_flags + '-O0 -fno-inline') env.Append(CXXFLAGS = common_cxx_flags + '-O0 -fno-inline')
else: else: