denoland
diff --git a/‎config/compiler/BUILD.gn
+3-5 b/‎config/compiler/BUILD.gn
+3-5
diff --git a/‎rust/cargo_crate.gni
+13 b/‎rust/cargo_crate.gni
+13
diff --git a/‎rust/run_build_script.py
+3 b/‎rust/run_build_script.py
+3
@@ -1961,10 +1961,8 @@ config("default_warnings") {
         # TODO(crbug.com/344680447): Fix and re-enable.
         cflags_cc += [ "-Wno-missing-template-arg-list-after-template-kw" ]
 
-        if (llvm_force_head_revision) {
-          # TODO(crbug.com/356172342): Fix and re-enable.
-          cflags_cc += [ "-Wno-dangling-assignment-gsl" ]
-        }
+        # TODO(crbug.com/356172342): Fix and re-enable.
+        cflags_cc += [ "-Wno-dangling-assignment-gsl" ]
       }
     }
 
@@ -1981,7 +1979,7 @@ config("default_warnings") {
   }
 
   # TODO(crbug.com/354162568): Clean up and enable.
-  if (llvm_force_head_revision && is_apple && use_lld) {
+  if (is_apple && use_lld) {
     ldflags += [ "-Wl,--no-warn-duplicate-rpath" ]
   }
 
 
@@ -425,6 +425,19 @@ template("cargo_crate") {
           rust_abi_target,
         ]
       }
+      if (current_cpu == "arm64" || current_cpu == "x64") {
+        args += [
+          "--pointer-width",
+          "64",
+        ]
+      } else if (current_cpu == "arm" || current_cpu == "x86") {
+        args += [
+          "--pointer-width",
+          "32",
+        ]
+      } else {
+        assert(false, "Architecture not supported")
+      }
       if (defined(invoker.features)) {
         args += [ "--features" ]
         args += invoker.features
 
@@ -76,6 +76,7 @@ def main():
                       required=True,
                       help='where to write output rustc flags')
   parser.add_argument('--target', help='rust target triple')
+  parser.add_argument('--pointer-width', help='rust target pointer width')
   parser.add_argument('--features', help='features', nargs='+')
   parser.add_argument('--env', help='environment variable', nargs='+')
   parser.add_argument('--rust-prefix', required=True, help='rust path prefix')
@@ -103,6 +104,7 @@ def main():
     env["OUT_DIR"] = tempdir
     env["CARGO_MANIFEST_DIR"] = os.path.abspath(args.src_dir)
     env["HOST"] = host_triple(rustc_path)
+    env["CARGO_CFG_TARGET_POINTER_WIDTH"] = args.pointer_width
     if args.target is None:
       env["TARGET"] = env["HOST"]
     else:
@@ -132,6 +134,7 @@ def main():
       env["CARGO_CFG_TARGET_OS"] = "android"
     elif env["CARGO_CFG_TARGET_OS"] == "darwin":
       env["CARGO_CFG_TARGET_OS"] = "macos"
+    env["CARGO_CFG_TARGET_POINTER_WIDTH"] = args.pointer_width
     if args.features:
       for f in args.features:
         feature_name = f.upper().replace("-", "_")
Original file line number	Diff line number	Diff line change
`@@ -1961,10 +1961,8 @@ config("default_warnings") {`
`1961`	`1961`	`# TODO(crbug.com/344680447): Fix and re-enable.`
`1962`	`1962`	`cflags_cc += [ "-Wno-missing-template-arg-list-after-template-kw" ]`
`1963`	`1963`
`1964`		`- if (llvm_force_head_revision) {`
`1965`		`- # TODO(crbug.com/356172342): Fix and re-enable.`
`1966`		`- cflags_cc += [ "-Wno-dangling-assignment-gsl" ]`
`1967`		`- }`
	`1964`	`+ # TODO(crbug.com/356172342): Fix and re-enable.`
	`1965`	`+ cflags_cc += [ "-Wno-dangling-assignment-gsl" ]`
`1968`	`1966`	`}`
`1969`	`1967`	`}`
`1970`	`1968`
`@@ -1981,7 +1979,7 @@ config("default_warnings") {`
`1981`	`1979`	`}`
`1982`	`1980`
`1983`	`1981`	`# TODO(crbug.com/354162568): Clean up and enable.`
`1984`		`- if (llvm_force_head_revision && is_apple && use_lld) {`
	`1982`	`+ if (is_apple && use_lld) {`
`1985`	`1983`	`ldflags += [ "-Wl,--no-warn-duplicate-rpath" ]`
`1986`	`1984`	`}`
`1987`	`1985`