Bug 1412460 - Don't write make variables in configure.d; r?build draft
authorGregory Szorc <gps@mozilla.com>
Wed, 01 Nov 2017 15:02:11 -0700
changeset 690348 1c3021164d7a6208ca444f0c913fcbe89b6ba8b4
parent 690347 9c39049d45412962a53d25654d40926fa789da62
child 690349 3e204c23c077e5beb890af57dad6b7fe9c82bede
push id87287
push usergszorc@mozilla.com
push dateWed, 01 Nov 2017 22:07:23 +0000
reviewersbuild
bugs1412460
milestone58.0a1
Bug 1412460 - Don't write make variables in configure.d; r?build So the file can be more easily consumed without this variable defined. MozReview-Commit-ID: DF3ASwx4SZP
configure.py
--- a/configure.py
+++ b/configure.py
@@ -92,17 +92,17 @@ def config_status(config):
 
     partial_config = PartialConfigEnvironment(config['TOPOBJDIR'])
     partial_config.write_vars(sanitized_config)
 
     # Write out a depfile so Make knows to re-run configure when relevant Python
     # changes.
     mk = Makefile()
     rule = mk.create_rule()
-    rule.add_targets(["$(OBJDIR)/config.status"])
+    rule.add_targets(["%s/config.status" % config['TOPOBJDIR']])
     rule.add_dependencies(itertools.chain(config['ALL_CONFIGURE_PATHS'],
                                           iter_modules_in_path(config['TOPOBJDIR'],
                                                                config['TOPSRCDIR'])))
     with open('configure.d', 'w') as fh:
         mk.dump(fh)
 
     # Other things than us are going to run this file, so we need to give it
     # executable permissions.