Bug 1412460 - Don't write make variables in configure.d; r=mshal
authorGregory Szorc <gps@mozilla.com>
Wed, 01 Nov 2017 15:02:11 -0700
changeset 442978 027f1c5da98e7212c1b229e603399fde263df92a
parent 442977 579dabc132bf3714cd3a84dd8e2b63dbdc7870d2
child 442979 e5329ac331301b546fabc42f4f387e20d40e5fb2
push id1618
push userCallek@gmail.com
push dateThu, 11 Jan 2018 17:45:48 +0000
treeherdermozilla-release@882ca853e05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1412460
milestone58.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1412460 - Don't write make variables in configure.d; r=mshal 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.