Backed out changeset 2f9f01f9fe93 (bug 1836369) for causing build bus…

…tages
Thaodan · Jun 20, 2023 · fb0da48 · fb0da48
1 parent bce5e01
commit fb0da48
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/python/mozbuild/mozbuild/action/generate_symbols_file.py b/python/mozbuild/mozbuild/action/generate_symbols_file.py
@@ -93,6 +93,3 @@ def generate_symbols_file(output, *args):
         output.write("".join("_%s\n" % s for s in symbols))
 
     return set(pp.includes)
-
-
-main = generate_symbols_file
diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
@@ -106,12 +106,12 @@ def Libxul(name, output_category=None):
     if CONFIG["RUSTC_NATVIS_LDFLAGS"]:
         LDFLAGS += CONFIG["RUSTC_NATVIS_LDFLAGS"]
 
-    if CONFIG["OS_TARGET"] != "Android":
+    if CONFIG["OS_ARCH"] == "Linux" and CONFIG["OS_TARGET"] != "Android":
         GeneratedFile(
             "symverscript",
-            script="/python/mozbuild/mozbuild/action/generate_symbols_file.py",
+            script="/build/gen_symverscript.py",
             inputs=["../symverscript.in"],
-            flags=[],
+            flags=["xul%s" % CONFIG["MOZILLA_SYMBOLVERSION"]],
         )
         SYMBOLS_FILE = "!symverscript"
 

diff --git a/toolkit/library/symverscript.in b/toolkit/library/symverscript.in
@@ -1 +1,4 @@
-XRE_GetBootstrap
+#filter substitution
+@VERSION@ {
+    global: *;
+};
Original file line number	Diff line number	Diff line change
Expand Up		@@ -93,6 +93,3 @@ def generate_symbols_file(output, *args):
		output.write("".join("_%s\n" % s for s in symbols))

		return set(pp.includes)


		main = generate_symbols_file