From add9b6424ec9eca058e3d8100d790a5a7aa8195b Mon Sep 17 00:00:00 2001 From: "joseph Kesselman (Keshlam) / Kubyc Solutions" Date: Sat, 5 Nov 2022 16:55:53 -0400 Subject: [PATCH 1/2] rust/issues/103606 --- README.md | 1 + config.toml.example | 6 +++--- src/bootstrap/config.rs | 1 - src/ci/run.sh | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 27e7145c5a99e..cae39cd0b7e19 100644 --- a/README.md +++ b/README.md @@ -59,6 +59,7 @@ by running it with the `--help` flag or reading the [rustc dev guide][rustcguide * `curl` * `git` * `ssl` which comes in `libssl-dev` or `openssl-devel` + * `gettext` (which also provides `envsubst`) * `pkg-config` if you are compiling on Linux and targeting Linux 2. Clone the [source] with `git`: diff --git a/config.toml.example b/config.toml.example index 2373fb2ec4fb0..b25cf1712173b 100644 --- a/config.toml.example +++ b/config.toml.example @@ -87,9 +87,9 @@ changelog-seen = 2 # this flag will indicate that this version check should not be done. #version-check = true -# Link libstdc++ statically into the rustc_llvm instead of relying on a -# dynamic version to be available. -#static-libstdcpp = true +# If true, link libstdc++ statically into the rustc_llvm instead of +# relying on a dynamic version to be available. +#static-libstdcpp = false # Whether to use Ninja to build LLVM. This runs much faster than make. #ninja = true diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs index 21dc11c48081e..94638a7baedbc 100644 --- a/src/bootstrap/config.rs +++ b/src/bootstrap/config.rs @@ -781,7 +781,6 @@ impl Config { config.llvm_optimize = true; config.ninja_in_file = true; config.llvm_version_check = true; - config.llvm_static_stdcpp = true; config.backtrace = true; config.rust_optimize = true; config.rust_optimize_tests = true; diff --git a/src/ci/run.sh b/src/ci/run.sh index 9a247fb60a8ee..bdc81e07aaaa5 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -63,6 +63,7 @@ RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-manage-submodules" RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-locked-deps" RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-cargo-native-static" RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-units-std=1" +RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set build.static-stdcpp=1 # Only produce xz tarballs on CI. gz tarballs will be generated by the release # process by recompressing the existing xz ones. This decreases the storage From 2506a99115dd00a71474e8dff1ed80eae3fea3a6 Mon Sep 17 00:00:00 2001 From: "joseph Kesselman (Keshlam) / Kubyc Solutions" Date: Sat, 5 Nov 2022 17:18:53 -0400 Subject: [PATCH 2/2] Somehow dropped a quote. Sigh. Fixed. --- src/ci/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ci/run.sh b/src/ci/run.sh index bdc81e07aaaa5..778dc1c0ada63 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -63,7 +63,7 @@ RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-manage-submodules" RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-locked-deps" RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-cargo-native-static" RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-units-std=1" -RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set build.static-stdcpp=1 +RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set build.static-stdcpp=1" # Only produce xz tarballs on CI. gz tarballs will be generated by the release # process by recompressing the existing xz ones. This decreases the storage