diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-11-20 17:27:10 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-11-20 17:27:10 +0300 |
| commit | e05be6bdbd8943bc87212bb430b322ffea366a32 (patch) | |
| tree | 8b4b713726e0356255185bb3f212481a81c64648 /SConstruct | |
| parent | 391096252b8848099517f4e78dec020e4707f2a3 (diff) | |
SCons: Proper solution for local symbols map
Configuration used to override the link flags, it better restore them
once the configuration is done.
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/SConstruct b/SConstruct index 05d24c88431..45c9ae3b84d 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 |