summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2018-03-25 16:53:56 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2018-05-25 19:42:45 (GMT)
commitd4b41bbd10023f8c391b4bbd2928cc435e19eda3 (patch)
tree1d73908d6af676adb29204a1bbac5e31e2617e5d
parent00ade7bc85441688369efef881d915804191e0eb (diff)
downloadSCons-d4b41bbd10023f8c391b4bbd2928cc435e19eda3.zip
SCons-d4b41bbd10023f8c391b4bbd2928cc435e19eda3.tar.gz
SCons-d4b41bbd10023f8c391b4bbd2928cc435e19eda3.tar.bz2
rename clang command package to clangCommon as it was breaking imports test.
-rw-r--r--src/engine/SCons/Tool/clang.py2
-rw-r--r--src/engine/SCons/Tool/clangCommon/__init__.py (renamed from src/engine/SCons/Tool/clang/__init__.py)3
-rw-r--r--src/engine/SCons/Tool/clangxx.py2
3 files changed, 4 insertions, 3 deletions
diff --git a/src/engine/SCons/Tool/clang.py b/src/engine/SCons/Tool/clang.py
index aba5598..c51e753 100644
--- a/src/engine/SCons/Tool/clang.py
+++ b/src/engine/SCons/Tool/clang.py
@@ -45,7 +45,7 @@ import sys
import SCons.Util
import SCons.Tool.cc
-from SCons.Tool.clang import get_clang_install_dirs
+from SCons.Tool.clangCommon import get_clang_install_dirs
compilers = ['clang']
diff --git a/src/engine/SCons/Tool/clang/__init__.py b/src/engine/SCons/Tool/clangCommon/__init__.py
index 775ba80..37efbf6 100644
--- a/src/engine/SCons/Tool/clang/__init__.py
+++ b/src/engine/SCons/Tool/clangCommon/__init__.py
@@ -13,4 +13,5 @@ clang_win32_dirs = [
def get_clang_install_dirs(platform):
if platform == 'win32':
return clang_win32_dirs
- else return [] \ No newline at end of file
+ else:
+ return [] \ No newline at end of file
diff --git a/src/engine/SCons/Tool/clangxx.py b/src/engine/SCons/Tool/clangxx.py
index 2bf4cf4..7194d9e 100644
--- a/src/engine/SCons/Tool/clangxx.py
+++ b/src/engine/SCons/Tool/clangxx.py
@@ -46,7 +46,7 @@ import sys
import SCons.Tool
import SCons.Util
import SCons.Tool.cxx
-from SCons.Tool.clang import get_clang_install_dirs
+from SCons.Tool.clangCommon import get_clang_install_dirs
compilers = ['clang++']