From 8a0760aaaf78664b2f487a25544f580ec3e3c2a0 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Tue, 10 Jun 2014 11:58:58 -0700 Subject: [PATCH] fixup benchmark build flags --- benchmark/build.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/benchmark/build.py b/benchmark/build.py index e39d4d3ea..a4cde9e82 100644 --- a/benchmark/build.py +++ b/benchmark/build.py @@ -6,11 +6,16 @@ Import ('env') test_env = env.Clone() -test_env['LIBS'] = copy(env['LIBMAPNIK_LIBS']) -test_env.AppendUnique(LIBS=env['MAPNIK_NAME']) +test_env['LIBS'] = [env['MAPNIK_NAME']] +test_env.AppendUnique(LIBS=copy(env['LIBMAPNIK_LIBS'])) +if env['RUNTIME_LINK'] == 'static' and env['PLATFORM'] == 'Linux': + test_env.AppendUnique(LIBS='dl') test_env.AppendUnique(CXXFLAGS='-g') -if 'g++' in env['CXX']: - test_env.Append(CXXFLAGS='-fPIC') +test_env['CXXFLAGS'] = copy(test_env['LIBMAPNIK_CXXFLAGS']) +test_env.Append(CPPDEFINES = env['LIBMAPNIK_DEFINES']) +if test_env['HAS_CAIRO']: + test_env.PrependUnique(CPPPATH=test_env['CAIRO_CPPPATHS']) + test_env.Append(CPPDEFINES = '-DHAVE_CAIRO') if env['PLATFORM'] == 'Darwin': test_env.Append(LINKFLAGS='-F/ -framework CoreFoundation')