From 48988ff2969a1966b994cf4f54fba8e5483caf0c Mon Sep 17 00:00:00 2001 From: Bo Peng Date: Wed, 4 Oct 2006 15:05:34 +0000 Subject: [PATCH] Scons: fix ICONV_LIB caching problem git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15236 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/scons/SConstruct | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/development/scons/SConstruct b/development/scons/SConstruct index 890becbbe3..060e1a0452 100644 --- a/development/scons/SConstruct +++ b/development/scons/SConstruct @@ -677,11 +677,11 @@ if not fast_start: print 'Did not find zdll.lib or zlib.h, exiting!' Exit(1) if conf.CheckLib('iconv'): - env['ICONV_LIB'] = ['iconv'] + env['ICONV_LIB'] = 'iconv' elif conf.CheckLib('libiconv'): - env['ICONV_LIB'] = ['libiconv'] + env['ICONV_LIB'] = 'libiconv' elif conf.CheckFunc('iconv_open'): - env['ICONV_LIB'] = [] + env['ICONV_LIB'] = None else: print 'Did not find iconv or libiconv, exiting!' Exit(1) @@ -1375,7 +1375,10 @@ elif frontend == 'qt4': frontend_libs = [x + qt_lib_suffix for x in qt_libs] -system_libs = env['ICONV_LIB'] +if env['ICONV_LIB'] is None: + system_libs = [] +else: + system_libs = [env['ICONV_LIB']] if platform_name in ['win32', 'cygwin']: # the final link step needs stdc++ to succeed under mingw # FIXME: shouldn't g++ automatically link to stdc++? -- 2.39.2