[SOL] Bump versions for release (anza-xyz#134)

Author: LucasSte

Cargo.lock

@@ -3145,7 +3145,7 @@ dependencies = [
 [[package]]
 name = "rustc-build-sysroot"
 version = "0.5.3"
-source = "git+https://github.com/anza-xyz/rustc-build-sysroot?tag=solana-tools-v1.48#0e6a6c1127ca9b33158334029693344e2638ec57"
+source = "git+https://github.com/anza-xyz/rustc-build-sysroot?tag=solana-tools-v1.49#9b36c221db90c5039463c572ccbb903972bda8ce"
 dependencies = [
  "anyhow",
  "rustc_version",

library/Cargo.toml

@@ -60,8 +60,5 @@ rustflags = ["-Cpanic=abort"]
 rustc-std-workspace-core = { path = 'rustc-std-workspace-core' }
 rustc-std-workspace-alloc = { path = 'rustc-std-workspace-alloc' }
 rustc-std-workspace-std = { path = 'rustc-std-workspace-std' }
-<<<<<<< HEAD
 compiler_builtins = { path = "compiler-builtins/compiler-builtins" }
-=======
-compiler_builtins = { git = "https://github.com/anza-xyz/compiler-builtins", tag = "solana-tools-v1.48" }
->>>>>>> 293a1b6c60a ([SOL] Create sbpfv4 target for ABIv2 (#130))
+

src/tools/miri/cargo-miri/Cargo.toml

@@ -18,7 +18,7 @@ directories = "6"
 rustc_version = "0.4"
 serde_json = "1.0.40"
 cargo_metadata = "0.19"
-rustc-build-sysroot = {git = "https://github.com/anza-xyz/rustc-build-sysroot", tag = "solana-tools-v1.48"  }
+rustc-build-sysroot = {git = "https://github.com/anza-xyz/rustc-build-sysroot", tag = "solana-tools-v1.49"  }
 
 # Enable some feature flags that dev-dependencies need but dependencies
 # do not.  This makes `./miri install` after `./miri build` faster.

src/tools/tidy/src/extdeps.rs

@@ -8,8 +8,8 @@ const ALLOWED_SOURCES: &[&str] = &[
     r#""registry+https://github.com/rust-lang/crates.io-index""#,
     // This is `rust_team_data` used by `site` in src/tools/rustc-perf,
     r#""git+https://github.com/rust-lang/team#a5260e76d3aa894c64c56e6ddc8545b9a98043ec""#,
-    r#""git+https://github.com/anza-xyz/compiler-builtins?tag=solana-tools-v1.48#759adff89713678bfd9c7630fe0f60088f635085""#,
-    r#""git+https://github.com/anza-xyz/rustc-build-sysroot?tag=solana-tools-v1.48#0e6a6c1127ca9b33158334029693344e2638ec57""#
+    r#""git+https://github.com/anza-xyz/compiler-builtins?tag=solana-tools-v1.49#759adff89713678bfd9c7630fe0f60088f635085""#,
+    r#""git+https://github.com/anza-xyz/rustc-build-sysroot?tag=solana-tools-v1.49#9b36c221db90c5039463c572ccbb903972bda8ce""#
 ];
 
 /// Checks for external package sources. `root` is the path to the directory that contains the