Bug 1836723 - Link against ntdll for rustc 1.70. r=firefox-build-system-reviewers,ahochheiden, a=dmeehan

glandium · glandium · commit 48f82ea58751 · 2023-06-05T22:05:16.000Z
Building with rustc 1.70 adds a dependency to the ntdll library through libstd using NtCreateFile/NtWriteFile (it previously picked the symbols at runtime). Differential Revision: https://phabricator.services.mozilla.com/D180011
diff --git a/js/src/build/moz.build b/js/src/build/moz.build
@@ -82,6 +82,7 @@ if CONFIG["OS_ARCH"] == "SunOS":
 if CONFIG["OS_ARCH"] == "WINNT":
     OS_LIBS += [
         "bcrypt",
+        "ntdll",
     ]
 
 if CONFIG["MOZ_NEEDS_LIBATOMIC"]:
diff --git a/security/manager/ssl/builtins/dynamic-library/moz.build b/security/manager/ssl/builtins/dynamic-library/moz.build
@@ -28,6 +28,7 @@ if CONFIG["OS_ARCH"] == "WINNT":
     ]
     OS_LIBS += [
         "bcrypt",
+        "ntdll",
     ]
 
 
diff --git a/security/manager/ssl/ipcclientcerts/dynamic-library/moz.build b/security/manager/ssl/ipcclientcerts/dynamic-library/moz.build
@@ -30,6 +30,7 @@ if CONFIG["OS_ARCH"] == "WINNT":
     ]
     OS_LIBS += [
         "bcrypt",
+        "ntdll",
     ]
 
 
diff --git a/security/manager/ssl/osclientcerts/dynamic-library/moz.build b/security/manager/ssl/osclientcerts/dynamic-library/moz.build
@@ -18,6 +18,7 @@ if CONFIG["OS_ARCH"] == "WINNT":
         "ncrypt",
         "userenv",
         "ws2_32",
+        "ntdll",
     ]
 
 if CONFIG["OS_ARCH"] == "Darwin":
diff --git a/toolkit/mozapps/defaultagent/moz.build b/toolkit/mozapps/defaultagent/moz.build
@@ -71,6 +71,7 @@ OS_LIBS += [
     "userenv",
     "wininet",
     "ws2_32",
+    "ntdll",
 ]
 
 DEFINES["NS_NO_XPCOM"] = True

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,7 @@ if CONFIG["OS_ARCH"] == "SunOS":`
`82`	`82`	`if CONFIG["OS_ARCH"] == "WINNT":`
`83`	`83`	`OS_LIBS += [`
`84`	`84`	`"bcrypt",`
	`85`	`+ "ntdll",`
`85`	`86`	`]`
`86`	`87`
`87`	`88`	`if CONFIG["MOZ_NEEDS_LIBATOMIC"]:`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ if CONFIG["OS_ARCH"] == "WINNT":`
`28`	`28`	`]`
`29`	`29`	`OS_LIBS += [`
`30`	`30`	`"bcrypt",`
	`31`	`+ "ntdll",`
`31`	`32`	`]`
`32`	`33`
`33`	`34`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ if CONFIG["OS_ARCH"] == "WINNT":`
`30`	`30`	`]`
`31`	`31`	`OS_LIBS += [`
`32`	`32`	`"bcrypt",`
	`33`	`+ "ntdll",`
`33`	`34`	`]`
`34`	`35`
`35`	`36`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ if CONFIG["OS_ARCH"] == "WINNT":`
`18`	`18`	`"ncrypt",`
`19`	`19`	`"userenv",`
`20`	`20`	`"ws2_32",`
	`21`	`+ "ntdll",`
`21`	`22`	`]`
`22`	`23`
`23`	`24`	`if CONFIG["OS_ARCH"] == "Darwin":`
Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ OS_LIBS += [`
`71`	`71`	`"userenv",`
`72`	`72`	`"wininet",`
`73`	`73`	`"ws2_32",`
	`74`	`+ "ntdll",`
`74`	`75`	`]`
`75`	`76`
`76`	`77`	`DEFINES["NS_NO_XPCOM"] = True`