From def040a42d20ab778b9a1386999c61f601f2f531 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Wed, 28 Jan 2015 13:40:58 -0800 Subject: [PATCH] try again to fix pgsql2sqlite linking on linux --- utils/pgsql2sqlite/build.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/utils/pgsql2sqlite/build.py b/utils/pgsql2sqlite/build.py index 2a7372bda..a150e02a6 100644 --- a/utils/pgsql2sqlite/build.py +++ b/utils/pgsql2sqlite/build.py @@ -56,9 +56,8 @@ if env.get('BOOST_LIB_VERSION_FROM_HEADER'): boost_system = 'boost_system%s' % env['BOOST_APPEND'] libraries.extend([boost_system]) -linkflags = env['CUSTOM_LDFLAGS'] if env['SQLITE_LINKFLAGS']: - linkflags.append(env['SQLITE_LINKFLAGS']) + program_env.Append(LINKFLAGS=env['SQLITE_LINKFLAGS']) if env['RUNTIME_LINK'] == 'static': if env['PLATFORM'] == 'Darwin': @@ -68,7 +67,7 @@ if env['RUNTIME_LINK'] == 'static': program_env.ParseConfig('pg_config --libs') libraries.append('dl') -pgsql2sqlite = program_env.Program('pgsql2sqlite', source, LIBS=libraries, LINKFLAGS=linkflags) +pgsql2sqlite = program_env.Program('pgsql2sqlite', source, LIBS=libraries) Depends(pgsql2sqlite, env.subst('../../src/%s' % env['MAPNIK_LIB_NAME'])) if 'uninstall' not in COMMAND_LINE_TARGETS: