Skip to content

Commit 8d62cc9

Browse files
committed
Build 1.83.0
1 parent c30c128 commit 8d62cc9

File tree

4 files changed

+72
-3
lines changed

4 files changed

+72
-3
lines changed

1.83.0/build.sh

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
#!/bin/sh
2+
3+
RUSTC_BOOTSTRAP_VERSION=1.82.0
4+
CARGO_BOOTSTRAP_VERSION=1.82.0
5+
RUST_VERSION=1.83.0
6+
7+
CONFIGURE_CARGO_STATIC_FLAGS="--enable-cargo-native-static"
8+
9+
# Since rust 1.38, OPENSSL_DIR has to be specified.
10+
export OPENSSL_DIR="/usr/local"
11+
12+
# Show backtraces on failures
13+
export RUST_BACKTRACE=1
14+
# Continue linking rustc driver dynamically
15+
export RUSTC_LINK_STD_INTO_RUSTC_DRIVER=0
16+
17+
BASE=`pwd`
18+
DEST=$1
19+
LLVM_ROOT=""
20+
21+
. ../checksums.sh
22+
. ../common.sh
23+
24+
fixup-vendor() {
25+
# add here your vendor patches, example:
26+
#fixup-vendor-patch openssl build.rs || exit 1
27+
}
28+
29+
RUN info clean extract prepatch fixup-vendor config xbuild xdist inst 2>&1
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- src/bootstrap/src/core/builder.rs.orig 2024-10-15 17:22:50 UTC
2+
+++ src/bootstrap/src/core/builder.rs
3+
@@ -1109,7 +1109,7 @@ impl<'a> Builder<'a> {
4+
/// Returns if `std` should be statically linked into `rustc_driver`.
5+
/// It's currently not done on `windows-gnu` due to linker bugs.
6+
pub fn link_std_into_rustc_driver(&self, target: TargetSelection) -> bool {
7+
- !target.triple.ends_with("-windows-gnu")
8+
+ !target.triple.ends_with("-windows-gnu") && !target.triple.ends_with("dragonfly")
9+
}
10+
11+
/// Obtain a compiler at a given stage and for a given host (i.e., this is the target that the
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
--- src/llvm-project/llvm/lib/Support/Unix/Path.inc.orig 2023-05-31 19:29:26 UTC
2+
+++ src/llvm-project/llvm/lib/Support/Unix/Path.inc
3+
@@ -74,13 +74,14 @@ extern char **environ;
4+
5+
#include <sys/types.h>
6+
#if !defined(__APPLE__) && !defined(__OpenBSD__) && !defined(__FreeBSD__) && \
7+
- !defined(__linux__) && !defined(__FreeBSD_kernel__) && !defined(_AIX)
8+
+ !defined(__linux__) && !defined(__FreeBSD_kernel__) && !defined(_AIX) && \
9+
+ !defined(__DragonFly__)
10+
#include <sys/statvfs.h>
11+
#define STATVFS statvfs
12+
#define FSTATVFS fstatvfs
13+
#define STATVFS_F_FRSIZE(vfs) vfs.f_frsize
14+
#else
15+
-#if defined(__OpenBSD__) || defined(__FreeBSD__)
16+
+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
17+
#include <sys/mount.h>
18+
#include <sys/param.h>
19+
#elif defined(__linux__)
20+
@@ -111,7 +112,7 @@ typedef uint_t uint;
21+
#define STATVFS_F_FRSIZE(vfs) static_cast<uint64_t>(vfs.f_bsize)
22+
#endif
23+
24+
-#if defined(__NetBSD__) || defined(__DragonFly__) || defined(__GNU__) || \
25+
+#if defined(__NetBSD__) || defined(__GNU__) || \
26+
defined(__MVS__)
27+
#define STATVFS_F_FLAG(vfs) (vfs).f_flag
28+
#else

checksums.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ SHA256_rustc_1_79_0_src_tar_gz=172ecf3c7d1f9d9fb16cd2a628869782670416ded0129e524
6565
SHA256_rustc_1_80_1_src_tar_gz=2c0b8f643942dcb810cbcc50f292564b1b6e44db5d5f45091153996df95d2dc4
6666
SHA256_rustc_1_81_0_src_tar_gz=872448febdff32e50c3c90a7e15f9bb2db131d13c588fe9071b0ed88837ccfa7
6767
SHA256_rustc_1_82_0_src_tar_gz=7c53f4509eda184e174efa6ba7d5eeb586585686ce8edefc781a2b11a7cf512a
68+
SHA256_rustc_1_83_0_src_tar_gz=722d773bd4eab2d828d7dd35b59f0b017ddf9a97ee2b46c1b7f7fac5c8841c6e
6869

6970
SHA256_cargo_0_27_0_x86_64_unknown_dragonfly_tar_xz=a0b670f797d01ea156cf3ca9f0a7aa2a76bfa8b35dfa779510cfedc1d82eb19b
7071
SHA256_rustc_1_26_0_x86_64_unknown_dragonfly_tar_xz=d14e5d973bfb671535212460d7eca2552379150ffc207712e825f06febdd57c6
@@ -286,6 +287,6 @@ SHA256_cargo_1_80_1_x86_64_unknown_dragonfly_tar_xz=c430af85f361c356171d39e18adb
286287
SHA256_rustc_1_80_1_x86_64_unknown_dragonfly_tar_xz=8736651a748f72c7cf41ea015f97e883d1936f8a0edb88c12eb41cf2a672a124
287288
SHA256_rust_std_1_80_1_x86_64_unknown_dragonfly_tar_xz=a93f6a8899dbe06c203b9d66d0851ccdc4a6ed03d6248789920a75aeab6f1fc0
288289

289-
SHA256_cargo_1_81_0_x86_64_unknown_dragonfly_tar_xz=76bad16c40aff68c7de1abd11f5b70eb60723de360119d5ab7155cffbe07cc13
290-
SHA256_rustc_1_81_0_x86_64_unknown_dragonfly_tar_xz=e0838c14c15ef4a2dcd6c98477de65f50a7066ce6817f8b092227833e42a7289
291-
SHA256_rust_std_1_81_0_x86_64_unknown_dragonfly_tar_xz=4ed6553d7d5032f537c6b19050022ab4fc4db09436c71aea76800da9259ab2b4
290+
SHA256_cargo_1_82_0_x86_64_unknown_dragonfly_tar_xz=ab340ccdac020a755aa6cb530ceef736c08d39d28c555f484859857510bed148
291+
SHA256_rustc_1_82_0_x86_64_unknown_dragonfly_tar_xz=ee51142bd96f1084d9ffe533e45ee4ae4f39d917d5952ca4b62c2d3323edf655
292+
SHA256_rust_std_1_82_0_x86_64_unknown_dragonfly_tar_xz=64e33769187f872ee067245186faa751cdc81f83623c741591132df99af13498

0 commit comments

Comments
 (0)