diff options
| author | William Deegan <bill@baddogconsulting.com> | 2020-12-27 01:41:47 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2020-12-27 01:41:47 (GMT) |
| commit | be9faad84daa0ad459e84c676c48b14816c1d247 (patch) | |
| tree | b33b82aed39e4f776365a982048c9a9adb91fd10 | |
| parent | a92b61d69a9066b500df7ff1d24611cc1ed1948b (diff) | |
| download | SCons-be9faad84daa0ad459e84c676c48b14816c1d247.zip SCons-be9faad84daa0ad459e84c676c48b14816c1d247.tar.gz SCons-be9faad84daa0ad459e84c676c48b14816c1d247.tar.bz2 | |
Address some comments from the PR regarding formatting, and license text block
| -rw-r--r-- | SCons/Tool/FortranCommon.py | 6 | ||||
| -rw-r--r-- | SCons/Tool/applelink.py | 9 | ||||
| -rw-r--r-- | test/CC/SHCCFLAGS.py | 1 |
3 files changed, 8 insertions, 8 deletions
diff --git a/SCons/Tool/FortranCommon.py b/SCons/Tool/FortranCommon.py index f8d9fdc..16b75e2 100644 --- a/SCons/Tool/FortranCommon.py +++ b/SCons/Tool/FortranCommon.py @@ -4,6 +4,9 @@ Stuff for processing Fortran, common to all fortran dialects. """ +# MIT License +# +# Copyright The SCons Foundation # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -22,8 +25,7 @@ Stuff for processing Fortran, common to all fortran dialects. # NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# +# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. import re import os.path diff --git a/SCons/Tool/applelink.py b/SCons/Tool/applelink.py index 6a4a37c..2cdbd50 100644 --- a/SCons/Tool/applelink.py +++ b/SCons/Tool/applelink.py @@ -166,19 +166,16 @@ def generate(env): env['LDMODULEPREFIX'] = '' env['LDMODULESUFFIX'] = '' env['LDMODULEFLAGS'] = CLVar('$LINKFLAGS -bundle') - env[ - 'LDMODULECOM'] = '$LDMODULE -o ${TARGET} $LDMODULEFLAGS' \ + env['LDMODULECOM'] = '$LDMODULE -o ${TARGET} $LDMODULEFLAGS' \ ' $SOURCES $_LIBDIRFLAGS $_LIBFLAGS $_FRAMEWORKPATH $_FRAMEWORKS $FRAMEWORKSFLAGS' # New stuff # env['_SHLIBSUFFIX'] = '${_SHLIBVERSION}${SHLIBSUFFIX}' - env[ - '__SHLIBVERSIONFLAGS'] = '${__lib_either_version_flag(__env__,' \ + env['__SHLIBVERSIONFLAGS'] = '${__lib_either_version_flag(__env__,' \ '"SHLIBVERSION","_APPLELINK_CURRENT_VERSION", "_SHLIBVERSIONFLAGS")}' - env[ - '__LDMODULEVERSIONFLAGS'] = '${__lib_either_version_flag(__env__,' \ + env['__LDMODULEVERSIONFLAGS'] = '${__lib_either_version_flag(__env__,' \ '"LDMODULEVERSION","_APPLELINK_CURRENT_VERSION", "_LDMODULEVERSIONFLAGS")}' diff --git a/test/CC/SHCCFLAGS.py b/test/CC/SHCCFLAGS.py index 0bb349b..71ed1c0 100644 --- a/test/CC/SHCCFLAGS.py +++ b/test/CC/SHCCFLAGS.py @@ -40,6 +40,7 @@ if sys.platform.find('irix') > -1: os.environ['LD_LIBRARYN32_PATH'] = '.' test.write('SConstruct', """ +DefaultEnvironment(tools=[]) foo = Environment(SHCCFLAGS = '%s', WINDOWS_INSERT_DEF=1) bar = Environment(SHCCFLAGS = '%s', WINDOWS_INSERT_DEF=1) |