Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rustc-nightly: bump to 1.83.0-20240927 #1220

Merged
merged 1 commit into from
Oct 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ jobs:
done
- name: Free additional disk space (if necessary)
run: |
if grep -Eq '^(chromium|code-server|code-oss|electron-headers-.*)$' ./built_tur_packages.txt; then
if grep -Eq '^(chromium|code-server|code-oss|electron-headers-.*|rustc-nightly)$' ./built_tur_packages.txt; then
sudo apt purge -yq $(dpkg -l | grep '^ii' | awk '{ print $2 }' | grep -P '(cabal-|dotnet-|ghc-|libmono|php|aspnetcore)') \
mono-runtime-common monodoc-manual ruby
sudo apt autoremove -yq
Expand Down
11 changes: 11 additions & 0 deletions tur/rustc-nightly/0001-set-TERMUX_PKG_API_LEVEL.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/src/bootstrap/src/utils/cc_detect.rs
+++ b/src/bootstrap/src/utils/cc_detect.rs
@@ -244,7 +244,7 @@
};

// The earliest API supported by NDK r26d is 21.
- let api_level = "21";
+ let api_level = "@TERMUX_PKG_API_LEVEL@";
let compiler = format!("{}{}-{}", triple_translated, api_level, compiler.clang());
let host_tag = if cfg!(target_os = "macos") {
// The NDK uses universal binaries, so this is correct even on ARM.
Original file line number Diff line number Diff line change
@@ -1,20 +1,15 @@
--- a/compiler/rustc_driver_impl/src/lib.rs
+++ b/compiler/rustc_driver_impl/src/lib.rs
@@ -1296,7 +1296,7 @@
tracing::subscriber::set_global_default(subscriber).unwrap();
}

@@ -87,10 +87,10 @@
#[macro_use]
mod print;
mod session_diagnostics;
-#[cfg(all(unix, any(target_env = "gnu", target_os = "macos")))]
+#[cfg(all(unix, any(target_env = "gnu", target_os = "macos"), not(target_os = "android")))]
mod signal_handler {
extern "C" {
fn backtrace_symbols_fd(
@@ -1340,7 +1340,7 @@
}
}
mod signal_handler;

-#[cfg(not(all(unix, any(target_env = "gnu", target_os = "macos"))))]
+#[cfg(not(all(unix, any(target_env = "gnu", target_os = "macos"), not(target_os = "android"))))]
mod signal_handler {
pub(super) fn install() {}
}
/// On platforms which don't support our signal handler's requirements,
/// simply use the default signal handler provided by std.
11 changes: 11 additions & 0 deletions tur/rustc-nightly/0003-link-with-libc++_shared.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/compiler/rustc_llvm/build.rs
+++ b/compiler/rustc_llvm/build.rs
@@ -350,6 +350,8 @@
|| target.contains("aix")
{
"c++"
+ } else if target.contains("android") {
+ "c++_shared"
} else if target.contains("netbsd") && llvm_static_stdcpp.is_some() {
// NetBSD uses a separate library when relocation is required
"stdc++_p"
11 changes: 11 additions & 0 deletions tur/rustc-nightly/0004-set-TMPDIR.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/library/std/src/sys/pal/unix/os.rs
+++ b/library/std/src/sys/pal/unix/os.rs
@@ -680,7 +680,7 @@
pub fn temp_dir() -> PathBuf {
crate::env::var_os("TMPDIR").map(PathBuf::from).unwrap_or_else(|| {
if cfg!(target_os = "android") {
- PathBuf::from("/data/local/tmp")
+ PathBuf::from("@TERMUX_PREFIX@/tmp")
} else {
PathBuf::from("/tmp")
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/src/tools/rust-analyzer/crates/proc-macro-srv/src/dylib.rs
+++ b/src/tools/rust-analyzer/crates/proc-macro-srv/src/dylib.rs
@@ -71,9 +71,8 @@ fn load_library(file: &Path) -> Result<Library, libloading::Error> {
@@ -69,9 +69,8 @@
use std::os::raw::c_int;

const RTLD_NOW: c_int = 0x00002;
Expand Down
Loading
Loading