Merge pull request #20 from SRI-CSL/master

issue #19

Author: travitch

README-freeBSD.md

@@ -67,7 +67,7 @@ to your shell startup (in '~/.profile' for bash):
 
     export LLVM_HOME=/usr/local/llvm-3.3
 
-Get LLVM and Clang version 3.5:
+Get LLVM and Clang version 3.3:
 
     svn co http://llvm.org/svn/llvm-project/llvm/branches/release_33 llvm
     cd llvm/tools

README.md

@@ -54,6 +54,11 @@ In addition to the above environment variables the following can be optionally u
    variable.
    Example `LLVM_COMPILER_PATH=/home/user/llvm_and_clang/Debug+Asserts/bin`.
 
+*  `WLLVM_CONFIGURE_ONLY` can be set to anything, when set `wllvm` and `wllvm++`
+   will not carry out the second phase that involves the production of bitcode.
+   This may prevent configuration errors being cause by the unexpected production
+   of the hidden bitcode files.
+
 Example building bitcode module
 ===============================
 
@@ -88,6 +93,15 @@ Example building an Operating System
 To see how to build freeBSD 10.0 from scratch check out the guide 
 [here.](../master/README-freeBSD.md)
 
+
+Example configuring without building bitcode
+================================
+
+
+    WLLVM_CONFIGURE_ONLY=1 CC=wllvm ./configure
+    CC=wllvm make
+    
+
 Debugging
 =========
 

wllvm

@@ -8,6 +8,7 @@
 # library or executable.
 
 import sys
+import os
 from driver.utils import *
 import driver.logconfig
 
@@ -16,5 +17,7 @@ cmd = cmd[1:]
 
 builder = getBuilder(cmd, False)
 buildObject(builder)
-buildAndAttachBitcode(builder)
+if not os.environ.get('WLLVM_CONFIGURE_ONLY', False):
+    buildAndAttachBitcode(builder)
+    
 

wllvm++

@@ -8,6 +8,7 @@
 # library or executable.
 
 import sys
+import os
 from driver.utils import *
 import driver.logconfig
 
@@ -16,4 +17,5 @@ cmd = cmd[1:]
 
 builder = getBuilder(cmd, True)
 buildObject(builder)
-buildAndAttachBitcode(builder)
+if not os.environ.get('WLLVM_CONFIGURE_ONLY', False):
+    buildAndAttachBitcode(builder)