diff options
| author | William Deegan <bill@baddogconsulting.com> | 2017-03-30 14:01:52 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2017-03-30 14:01:52 (GMT) |
| commit | 62491bb09fc2b9ff71d498bf24ea5f961acbea26 (patch) | |
| tree | f4a6d2e653bc547f57d25b9015dd9c7e9f26f0d9 /src | |
| parent | 505bd97fd79f0f5d8c18252d28dcfeafa5fe2fa4 (diff) | |
| download | SCons-62491bb09fc2b9ff71d498bf24ea5f961acbea26.zip SCons-62491bb09fc2b9ff71d498bf24ea5f961acbea26.tar.gz SCons-62491bb09fc2b9ff71d498bf24ea5f961acbea26.tar.bz2 | |
py2/3 don't use __import_ c++, just load via import SCons.tool.cxx py2/3. py3 doesn't allow modules with + in them anymore
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/SCons/Tool/link.py | 5 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/qt.py | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/engine/SCons/Tool/link.py b/src/engine/SCons/Tool/link.py index ae2c4b8..b7db947 100644 --- a/src/engine/SCons/Tool/link.py +++ b/src/engine/SCons/Tool/link.py @@ -46,7 +46,10 @@ import SCons.Warnings from SCons.Tool.FortranCommon import isfortran from SCons.Tool.DCommon import isD -cplusplus = __import__(__package__+'.c++', globals(), locals(), ['*']) + +import SCons.Tool.cxx +cplusplus = SCons.Tool.cxx +# cplusplus = __import__(__package__+'.cxx', globals(), locals(), ['*']) issued_mixed_link_warning = False diff --git a/src/engine/SCons/Tool/qt.py b/src/engine/SCons/Tool/qt.py index f01fff6..5f99054 100644 --- a/src/engine/SCons/Tool/qt.py +++ b/src/engine/SCons/Tool/qt.py @@ -59,7 +59,11 @@ SCons.Warnings.enableWarningClass(ToolQtWarning) header_extensions = [".h", ".hxx", ".hpp", ".hh"] if SCons.Util.case_sensitive_suffixes('.h', '.H'): header_extensions.append('.H') -cplusplus = __import__('c++', globals(), locals(), []) + +import SCons.Tool.cxx +cplusplus = SCons.Tool.cxx +#cplusplus = __import__('cxx', globals(), locals(), []) + cxx_suffixes = cplusplus.CXXSuffixes def checkMocIncluded(target, source, env): |