Bug 1744886 - Override the vcpkg and cmake crates. r=firefox-build-system-reviewers,andi (4b86be51) · Commits · clairehurst / Tor Browser

Cargo.lock

+2 −9

Original line number	Diff line number	Diff line
		@@ -672,12 +672,7 @@ dependencies = [

		[[package]]
		name = "cmake"
		version = "0.1.46"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "b7b858541263efe664aead4a5209a4ae5c5d2811167d4ed4ee0944503f8d2089"
		dependencies = [
		"cc",
		]
		version = "0.1.999"

		[[package]]
		name = "codespan-reporting"
		@@ -5355,9 +5350,7 @@ dependencies = [

		[[package]]
		name = "vcpkg"
		version = "0.2.13"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "025ce40a007e1907e58d5bc1a594def78e5573bb0b1160bc389634e8f12e4faa"
		version = "0.2.999"

		[[package]]
		name = "version_check"

+7 −0

Original line number	Diff line number	Diff line
		@@ -78,6 +78,13 @@ opt-level = 2
		opt-level = 2

		[patch.crates-io]
		# The build system doesn't want those to be used, but they are pulled anyways (because
		# dependencies can't be disabled based on features), but remain unused. We ensure they
		# stay unused by overriding them with crates that contain enough to build the current
		# code and will fail the build in unwanted cases.
		cmake = { path = "build/rust/cmake" }
		vcpkg = { path = "build/rust/vcpkg" }

		# Patch autocfg to hide rustc output. Workaround for https://github.com/cuviper/autocfg/issues/30
		autocfg = { path = "third_party/rust/autocfg" }

0 → 100644

+8 −0

0 → 100644

+3 −0

Original line number	Diff line number	Diff line
		/* This Source Code Form is subject to the terms of the Mozilla Public
		* License, v. 2.0. If a copy of the MPL was not distributed with this
		* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

0 → 100644

+8 −0