treat the 'take input from standard in' case as a variant of configure only. since presumably thats when it happens.

Author: ianamason

wllvm/arglistfilter.py

@@ -31,6 +31,8 @@ class ArgumentListFilter(object):
     def __init__(self, inputList, exactMatches={}, patternMatches={}):
         defaultArgExactMatches = {
 
+            '-' : (0, ArgumentListFilter.standardInCallback),
+
             '-o' : (1, ArgumentListFilter.outputFileCallback),
             '-c' : (0, ArgumentListFilter.compileOnlyCallback),
             '-E' : (0, ArgumentListFilter.preprocessOnlyCallback),
@@ -256,7 +258,7 @@ def __init__(self, inputList, exactMatches={}, patternMatches={}):
         self.isAssembly = False
         self.isCompileOnly = False
         self.isEmitLLVM = False
-
+        self.isStandardIn = False
 
         argExactMatches = dict(defaultArgExactMatches)
         argExactMatches.update(exactMatches)
@@ -305,6 +307,11 @@ def _shiftArgs(self, nargs):
             nargs = nargs - 1
         return ret
 
+
+    def standardInCallback(self, flag):
+        _logger.debug('standardInCallback: %s', flag)
+        self.isStandardIn = True
+
     def abortUnaryCallback(self, flag):
         _logger.warning('Out of context experience: "%s" "%s"', str(self.inputList), flag)
         sys.exit(1)

wllvm/compilers.py

@@ -30,12 +30,22 @@ def wcompile(mode):
         builder = getBuilder(cmd, mode)
         rc = buildObject(builder)
 
-        if rc == 0 and not os.environ.get('WLLVM_CONFIGURE_ONLY', False):
-            buildAndAttachBitcode(builder)
+        # phase one compile failed. no point continuing
+        if rc != 0:
+            _logger.info('phase one failed: %s', str(sys.argv))
+            return rc
+
+        # configure only; continuing not desired
+        if os.environ.get('WLLVM_CONFIGURE_ONLY', False):
+            return rc
+
+        # phase two
+        buildAndAttachBitcode(builder)
+
     except Exception as e:
         _logger.debug('%s: exception case: %s', mode, str(e))
 
-    _logger.info('Calling %s returned %d',  list(sys.argv), rc)  
+    _logger.info('Calling %s returned %d',  list(sys.argv), rc)
     return rc
 
 
@@ -236,7 +246,8 @@ def buildAndAttachBitcode(builder):
 
     af = builder.getBitcodeArglistFilter()
 
-    if not af.inputFiles or af.isEmitLLVM or af.isAssembly or af.isAssembleOnly or (af.isDependencyOnly and not af.isCompileOnly) or af.isPreprocessOnly:
+
+    if not af.inputFiles or af.isEmitLLVM or af.isAssembly or af.isAssembleOnly or (af.isDependencyOnly and not af.isCompileOnly) or af.isPreprocessOnly or af.isStandardIn:
         _logger.debug('No work to do')
         _logger.debug(af.__dict__)
         return