Bug 1547730 - Add six to path when running configure. r=glandium
authorJustin Wood <Callek@gmail.com>
Tue, 28 May 2019 14:23:35 +0000
changeset 475890 198001a673f6ae43eb5edfea4f3a095c1ee5682b
parent 475889 d799c2e1cd02bbd0fbba0871e4fe04f66c7be7a5
child 475891 abbfe68afc04cd4473f152f75b4f65e8a5d5dc69
push id86529
push userjwood@mozilla.com
push dateTue, 28 May 2019 14:47:17 +0000
treeherderautoland@dbadda4e3c1c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1547730
milestone69.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 1547730 - Add six to path when running configure. r=glandium This is necessary for any attempt at @import('six') or doing any similar py2+py3 work in the configure sandbox. Differential Revision: https://phabricator.services.mozilla.com/D29604
configure.py
--- a/configure.py
+++ b/configure.py
@@ -9,16 +9,17 @@ import itertools
 import logging
 import os
 import sys
 import textwrap
 
 
 base_dir = os.path.abspath(os.path.dirname(__file__))
 sys.path.insert(0, os.path.join(base_dir, 'python', 'mozbuild'))
+sys.path.insert(0, os.path.join(base_dir, 'third_party', 'python', 'six'))
 from mozbuild.configure import (
     ConfigureSandbox,
     TRACE,
 )
 from mozbuild.pythonutil import iter_modules_in_path
 from mozbuild.backend.configenvironment import PartialConfigEnvironment
 from mozbuild.util import (
     indented_repr,