Dejan's issue.

Author: ianamason

README.md

@@ -49,8 +49,14 @@ Three environment variables must be set to use these wrappers:
 Once the environment is set up, just use `wllvm` and `wllvm++` as your C
 and C++ compilers, respectively.
 
+
 In addition to the above environment variables the following can be optionally used:
 
+ * `LLVM_CC_NAME` can be set if your clang compiler is not called `clang` but
+    something like `clang-3.7`. Similarly `LLVM_CXX_NAME` can be used to describe
+    what the C++ is called. Note that in these sorts of cases, the environment
+    variable `LLVM_COMPILER` should still be set to `clang` not `clang-3.7` etc.
+
  * `LLVM_COMPILER_PATH` can be set to the absolute path to the folder that
    contains the compiler and other LLVM tools such as `llvm-link` to be used.
    This prevents searching for the compiler in your PATH environment variable.

driver/utils.py

@@ -543,16 +543,24 @@ def getBitcodeFileName(self, argFilter):
 class ClangBuilder(BuilderBase):
     def __init__(self, cmd, isCxx, prefixPath=None):
         super(ClangBuilder, self).__init__(cmd, isCxx, prefixPath)
-
+        
     def getBitcodeCompiler(self):
         cc = self.getCompiler()
         return cc + ['-emit-llvm']
 
     def getCompiler(self):
         if self.isCxx:
-            return ['{0}clang++'.format(self.prefixPath)]
+            cxx =  os.getenv('LLVM_CXX_NAME')
+            if cxx:
+                return ['{0}{1}'.format(self.prefixPath, cxx)]
+            else:
+                return ['{0}clang++'.format(self.prefixPath)]
         else:
-            return ['{0}clang'.format(self.prefixPath)]
+            cc =  os.getenv('LLVM_CC_NAME')
+            if cc:
+                return ['{0}{1}'.format(self.prefixPath, cc)]
+            else:
+                return ['{0}clang'.format(self.prefixPath)]
 
     def getBitcodeArglistFilter(self):
         return ClangBitcodeArgumentListFilter(self.cmd)
@@ -566,7 +574,6 @@ def attachBitcode(self, argFilter):
         outFile = argFilter.getOutputFilename()
         attachBitcodePathToObject(bcname, outFile)
 
-#iam: this should join the dodo soon, yes?
 class DragoneggBuilder(BuilderBase):
     def __init__(self, cmd, isCxx, prefixPath=None):
         super(DragoneggBuilder, self).__init__(cmd, isCxx, prefixPath)