Bug 1369292 - Avoid running config.status in js/src. r=mshal

--HG--
extra : rebase_source : d07f48487fe18b846e8fcf7830524e4518a25702

build/subconfigure.py

@@ -131,6 +131,10 @@ def split_template(s):
 
 
 def get_config_files(data):
+    # config.status in js/src never contains the output we try to scan here.
+    if data['relobjdir'] == 'js/src':
+        return [], []
+
     config_status = mozpath.join(data['objdir'], 'config.status')
     if not os.path.exists(config_status):
         return [], []
@@ -260,6 +264,7 @@ def run(objdir):
         data = pickle.load(f)
 
     data['objdir'] = objdir
+    relobjdir = data['relobjdir'] = os.path.relpath(objdir, os.getcwd())
 
     cache_file = data['cache-file']
     cleared_cache = True
@@ -297,8 +302,6 @@ def run(objdir):
                 cleared_cache:
             skip_configure = False
 
-    relobjdir = os.path.relpath(objdir, os.getcwd())
-
     if not skip_configure:
         if mozpath.normsep(relobjdir) == 'js/src':
             # Because configure is a shell script calling a python script
@@ -345,7 +348,11 @@ def run(objdir):
     # - one of the templates for config files is newer than the corresponding
     #   config file.
     skip_config_status = True
-    if not config_status or config_status.modified:
+    if mozpath.normsep(relobjdir) == 'js/src':
+        # Running config.status in js/src actually does nothing, so we just
+        # skip it.
+        pass
+    elif not config_status or config_status.modified:
         # If config.status doesn't exist after configure (because it's not
         # an autoconf configure), skip it.
         if os.path.exists(config_status_path):