summaryrefslogtreecommitdiffstats
path: root/source/l/mozjs68/patches/emitter.patch
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--source/l/mozjs68/patches/emitter.patch (renamed from source/l/mozjs60/patches/emitter.patch)13
1 files changed, 6 insertions, 7 deletions
diff --git a/source/l/mozjs60/patches/emitter.patch b/source/l/mozjs68/patches/emitter.patch
index 0f414d7cd..42545534a 100644
--- a/source/l/mozjs60/patches/emitter.patch
+++ b/source/l/mozjs68/patches/emitter.patch
@@ -1,15 +1,14 @@
--- a/python/mozbuild/mozbuild/frontend/emitter.py
+++ b/python/mozbuild/mozbuild/frontend/emitter.py
-@@ -1127,11 +1127,6 @@
- raise SandboxValidationError('Path specified in LOCAL_INCLUDES '
- 'does not exist: %s (resolved to %s)' % (local_include,
- full_path), context)
+@@ -1195,11 +1195,6 @@
+ raise SandboxValidationError('Path specified in LOCAL_INCLUDES '
+ 'is a filename, but a directory is required: %s '
+ '(resolved to %s)' % (local_include, full_path), context)
- if (full_path == context.config.topsrcdir or
- full_path == context.config.topobjdir):
- raise SandboxValidationError('Path specified in LOCAL_INCLUDES '
-- 'is not allowed: %s (resolved to %s)' % (local_include,
-- full_path), context)
+- '(%s) resolves to the topsrcdir or topobjdir (%s), which is '
+- 'not allowed' % (local_include, full_path), context)
include_obj = LocalInclude(context, local_include)
local_includes.append(include_obj.path.full_path)
yield include_obj
-