From d4b41bbd10023f8c391b4bbd2928cc435e19eda3 Mon Sep 17 00:00:00 2001
From: William Deegan <bill@baddogconsulting.com>
Date: Sun, 25 Mar 2018 12:53:56 -0400
Subject: rename clang command package to clangCommon as it was breaking
 imports test.

---
 src/engine/SCons/Tool/clang.py                |  2 +-
 src/engine/SCons/Tool/clang/__init__.py       | 16 ----------------
 src/engine/SCons/Tool/clangCommon/__init__.py | 17 +++++++++++++++++
 src/engine/SCons/Tool/clangxx.py              |  2 +-
 4 files changed, 19 insertions(+), 18 deletions(-)
 delete mode 100644 src/engine/SCons/Tool/clang/__init__.py
 create mode 100644 src/engine/SCons/Tool/clangCommon/__init__.py

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/clang/__init__.py
deleted file mode 100644
index 775ba80..0000000
--- a/src/engine/SCons/Tool/clang/__init__.py
+++ /dev/null
@@ -1,16 +0,0 @@
-"""
-Common routines and data for clang tools
-"""
-
-clang_win32_dirs = [
-    r'C:\Program Files\LLVM\bin',
-    r'C:\cygwin64\bin',
-    r'C:\msys64',
-    r'C:\cygwin\bin',
-    r'C:\msys',
-]
-
-def get_clang_install_dirs(platform):
-    if platform == 'win32':
-        return clang_win32_dirs
-    else return []
\ No newline at end of file
diff --git a/src/engine/SCons/Tool/clangCommon/__init__.py b/src/engine/SCons/Tool/clangCommon/__init__.py
new file mode 100644
index 0000000..37efbf6
--- /dev/null
+++ b/src/engine/SCons/Tool/clangCommon/__init__.py
@@ -0,0 +1,17 @@
+"""
+Common routines and data for clang tools
+"""
+
+clang_win32_dirs = [
+    r'C:\Program Files\LLVM\bin',
+    r'C:\cygwin64\bin',
+    r'C:\msys64',
+    r'C:\cygwin\bin',
+    r'C:\msys',
+]
+
+def get_clang_install_dirs(platform):
+    if platform == 'win32':
+        return clang_win32_dirs
+    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++']
-- 
cgit v0.12