Merge branch 'master' of github.com:SRI-CSL/whole-program-llvm

Author: Ian A.Mason

wllvm/compilers.py

@@ -200,15 +200,18 @@ def getCommand(self):
 
 
 class ClangBuilder(BuilderBase):
-    def getBitcodeCompiler(self):
-        cc = self.getCompiler()
-        retval = cc + ['-emit-llvm']
+
+    def getBitcodeGenerationFlags(self):
         # iam: If the environment variable LLVM_BITCODE_GENERATION_FLAGS is set we will add them to the
         # bitcode generation step
         bitcodeFLAGS  = os.getenv('LLVM_BITCODE_GENERATION_FLAGS')
         if bitcodeFLAGS:
-            retval = retval + bitcodeFLAGS.split()
-        return retval
+            return bitcodeFLAGS.split()
+        return []
+
+    def getBitcodeCompiler(self):
+        cc = self.getCompiler()
+        return cc + ['-emit-llvm'] + self.getBitcodeGenerationFlags()
 
     def getCompiler(self):
         if self.mode == "wllvm++":