[Bf-blender-cvs] [d5e0613] input_method_editor: SCons: Proper solution for local symbols map

[Sergey Sharybin]

Commit: d5e0613d6eb05a729fdeddb6078dc5c3a31f3c5e
Author: Sergey Sharybin
Date:   Thu Nov 20 15:27:10 2014 +0100
Branches: input_method_editor
https://developer.blender.org/rBd5e0613d6eb05a729fdeddb6078dc5c3a31f3c5e

SCons: Proper solution for local symbols map

Configuration used to override the link flags, it better restore them
once the configuration is done.

===================================================================

M	SConstruct
M	source/blender/makesdna/intern/SConscript
M	source/blender/makesrna/intern/SConscript

===================================================================

diff --git a/SConstruct b/SConstruct
index 05d24c8..45c9ae3 100644
--- a/SConstruct
+++ b/SConstruct
@@ -860,9 +860,11 @@ if B.targets != ['cudakernels']:
     from FindUnorderedMap import FindUnorderedMap
 
     conf = Configure(env)
+    old_linkflags = conf.env['LINKFLAGS']
     conf.env.Append(LINKFLAGS=env['PLATFORM_LINKFLAGS'])
     FindSharedPtr(conf)
     FindUnorderedMap(conf)
+    conf.env['LINKFLAGS'] = old_linkflags
     env = conf.Finish()
 
 # End of auto configuration
diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript
index de84f6f..50c26eb 100644
--- a/source/blender/makesdna/intern/SConscript
+++ b/source/blender/makesdna/intern/SConscript
@@ -64,6 +64,7 @@ if sys.platform != 'cygwin':
 makesdna_tool.Append (CPPDEFINES = defines)
 makesdna_tool.Append( CFLAGS = env['CFLAGS'])
 makesdna_tool.Append( CCFLAGS = env['CCFLAGS'])
+makesdna_tool.Append( LINKFLAGS = env['PLATFORM_LINKFLAGS'])
 targetdir = normpath(root_build_dir+'/lib')
 
 if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'):
diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript
index 192923f..28151fe 100644
--- a/source/blender/makesrna/intern/SConscript
+++ b/source/blender/makesrna/intern/SConscript
@@ -191,6 +191,7 @@ makesrna_tool.Append (LIBPATH = libdir)
 
 makesrna_tool.Append( CFLAGS = env['CFLAGS'])
 makesrna_tool.Append( CCFLAGS = env['CCFLAGS'])
+makesrna_tool.Append( LINKFLAGS = env['PLATFORM_LINKFLAGS'])
 
 if env['BF_PROFILE']:
     makesrna_tool.Append (LINKFLAGS = env['BF_PROFILE_FLAGS'])