-
Notifications
You must be signed in to change notification settings - Fork 21
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Strip rust-toolchain.toml from current directory of build script runs
Summary: See the explanation on `create_cwd`. This fixes the incompatibility with proc-macro2 1.0.57 observed in D45864167. Alternatives considered: - `http_archive` has an `excludes` mechanism which could work here, but it is hideous because it is based on regex, unlike everything else in BUCK which use globs. `excludes = ["^proc-macro2-1\\.0\\.57/rust-toolchain(\\.toml)?$"]`. The approach in this diff avoids adding any noise into the reindeer-generated targets. - I considered implementing a workaround in cargo_buildscript.bzl instead of in buildscript_run.py, basically by making a `filegroup` that overlays `rust-toolchain/.go_away_rustup` + `rust-toolchain.toml/.go_away_rustup` on top of the crate's sources. Having rust-toolchain.toml be a directory causes rustup's file read of that path to fail, which it treats the same as if the path does not exist. I prefer the more straightforward workaround in this diff. Reviewed By: themarwhal Differential Revision: D45942826 fbshipit-source-id: 730f2e0568645825f76f4f4cfec600a2ebd4a444
- Loading branch information
1 parent
eaf3323
commit 9546535
Showing
2 changed files
with
73 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters