Bug 1154687 - Restore EXTERNALLY_MANAGED_MAKE_FILE handling to the moz.build blacklist check. r=gps

--HG--
extra : rebase_source : 030e223536b2077cbfffce5b8a7cd43f4deef94e
This commit is contained in:
Brian O'Keefe 2015-04-15 08:15:03 -04:00
Родитель 91b061ba84
Коммит 0fb2aa4bf1
1 изменённых файлов: 4 добавлений и 0 удалений

Просмотреть файл

@ -702,6 +702,10 @@ class RecursiveMakeBackend(CommonBackend):
rule.add_dependencies(['$(CURDIR)/%: %'])
def _check_blacklisted_variables(self, makefile_in, makefile_content):
if b'EXTERNALLY_MANAGED_MAKE_FILE' in makefile_content:
# Bypass the variable restrictions for externally managed makefiles.
return
for x in MOZBUILD_VARIABLES:
if re.search(r'^[^#]*\b%s\s*[:?+]?=' % x, makefile_content, re.M):
raise Exception('Variable %s is defined in %s. It should '