about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-09-05 11:52:21 +0000
committerbors <bors@rust-lang.org>2023-09-05 11:52:21 +0000
commitb402182d4e0b00254c1afd0620547e2ee42ae336 (patch)
treef3ef5c236cf0c2fc81953f91fce6d20ac8a3136f
parentaf488be5f82b5e1010f7b52bc4fcda697793950d (diff)
parentd454cab405ee018833d63fcf149b5f215cb0213c (diff)
downloadrust-b402182d4e0b00254c1afd0620547e2ee42ae336.tar.gz
rust-b402182d4e0b00254c1afd0620547e2ee42ae336.zip
Auto merge of #115544 - onur-ozkan:patch-binaries-for-nix-configure, r=albertlarsan68
support `{disable,enable}-patch-binaries-for-nix` in configure.py

Provide the control of `patch-binaries-for-nix` flag from configure.py without requiring manual editing.

It's useful when:

https://github.com/rust-lang/rust/blob/bf1e3f31f95c0f75b9bf51a58e8684f750f919f2/src/bootstrap/bootstrap.py#L661-L667
-rwxr-xr-xsrc/bootstrap/configure.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py
index 15e8c1eb9f8..f469dbea6db 100755
--- a/src/bootstrap/configure.py
+++ b/src/bootstrap/configure.py
@@ -58,6 +58,7 @@ o("clang", "llvm.clang", "build clang")
 o("missing-tools", "dist.missing-tools", "allow failures when building tools")
 o("use-libcxx", "llvm.use-libcxx", "build LLVM with libc++")
 o("control-flow-guard", "rust.control-flow-guard", "Enable Control Flow Guard")
+o("patch-binaries-for-nix", "build.patch-binaries-for-nix", "whether patch binaries for usage with Nix toolchains")
 
 v("llvm-cflags", "llvm.cflags", "build LLVM with these extra compiler flags")
 v("llvm-cxxflags", "llvm.cxxflags", "build LLVM with these extra compiler flags")