forked from bartvdbraak/blender
SCons: Proper solution for local symbols map
Configuration used to override the link flags, it better restore them once the configuration is done.
This commit is contained in:
parent
391096252b
commit
e05be6bdbd
@ -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
|
||||
|
@ -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]==':'):
|
||||
|
@ -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'])
|
||||
|
Loading…
Reference in New Issue
Block a user