Skip to content

Commit f4990f9

Browse files
committed
Don't include C define flags in assembler arguments.
1 parent 7df568d commit f4990f9

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

etc/patches/no_asm_defines.patch

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- a/mozjs/python/mozbuild/mozbuild/frontend/emitter.py
2+
+++ b/mozjs/python/mozbuild/mozbuild/frontend/emitter.py
3+
@@ -1136,7 +1136,7 @@ class TreeMetadataEmitter(LoggingMixin):
4+
generated_files.add(str(sub.relpath))
5+
yield sub
6+
7+
- for defines_var, cls, backend_flags in (('DEFINES', Defines, (computed_flags, computed_as_flags)),
8+
+ for defines_var, cls, backend_flags in (('DEFINES', Defines, (computed_flags,)),
9+
('HOST_DEFINES', HostDefines, (computed_host_flags,))):
10+
defines = context.get(defines_var)
11+
if defines:

mozjs/python/mozbuild/mozbuild/frontend/emitter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1136,7 +1136,7 @@ def emit_from_context(self, context):
11361136
generated_files.add(str(sub.relpath))
11371137
yield sub
11381138

1139-
for defines_var, cls, backend_flags in (('DEFINES', Defines, (computed_flags, computed_as_flags)),
1139+
for defines_var, cls, backend_flags in (('DEFINES', Defines, (computed_flags,)),
11401140
('HOST_DEFINES', HostDefines, (computed_host_flags,))):
11411141
defines = context.get(defines_var)
11421142
if defines:

0 commit comments

Comments
 (0)