summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2020-04-21 16:37:19 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2020-04-21 16:39:23 (GMT)
commitdba5fb0b1f651b8d4d4b61d7be15a5bee3ca8052 (patch)
tree577361b632b972b6c28c8d68c4395229805e15c2 /src/engine/SCons
parent2ac471036f67db9121df7cc238d982116d591f92 (diff)
downloadSCons-dba5fb0b1f651b8d4d4b61d7be15a5bee3ca8052.zip
SCons-dba5fb0b1f651b8d4d4b61d7be15a5bee3ca8052.tar.gz
SCons-dba5fb0b1f651b8d4d4b61d7be15a5bee3ca8052.tar.bz2
PEP8 + removed '-Wl,-Bsymbolic' from SHLIBVERSIONFLAGS fixes issue #3248
Diffstat (limited to 'src/engine/SCons')
-rw-r--r--src/engine/SCons/Tool/gnulink.py17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/engine/SCons/Tool/gnulink.py b/src/engine/SCons/Tool/gnulink.py
index b1d5088..5372322 100644
--- a/src/engine/SCons/Tool/gnulink.py
+++ b/src/engine/SCons/Tool/gnulink.py
@@ -35,9 +35,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
import SCons.Util
import SCons.Tool
-import os
import sys
-import re
from . import link
@@ -57,21 +55,22 @@ def generate(env):
# OpenBSD doesn't usually use SONAME for libraries
use_soname = not sys.platform.startswith('openbsd')
- link._setup_versioned_lib_variables(env, tool = 'gnulink', use_soname = use_soname)
+ link._setup_versioned_lib_variables(env, tool='gnulink', use_soname=use_soname)
env['LINKCALLBACKS'] = link._versioned_lib_callbacks()
- # For backward-compatibility with older SCons versions
- env['SHLIBVERSIONFLAGS'] = SCons.Util.CLVar('-Wl,-Bsymbolic')
-
+ # # For backward-compatibility with older SCons versions
+ # env['SHLIBVERSIONFLAGS'] = SCons.Util.CLVar('')
+
+
def exists(env):
# TODO: sync with link.smart_link() to choose a linker
- linkers = { 'CXX': ['g++'], 'CC': ['gcc'] }
+ linkers = {'CXX': ['g++'], 'CC': ['gcc']}
alltools = []
for langvar, linktools in linkers.items():
- if langvar in env: # use CC over CXX when user specified CC but not CXX
+ if langvar in env: # use CC over CXX when user specified CC but not CXX
return SCons.Tool.FindTool(linktools, env)
alltools.extend(linktools)
- return SCons.Tool.FindTool(alltools, env) # find CXX or CC
+ return SCons.Tool.FindTool(alltools, env) # find CXX or CC
# Local Variables:
# tab-width:4