Skip to content

Commit da9f1dd

Browse files
committed
[DO NOT MERGE] test with PR CI
1 parent 6834063 commit da9f1dd

File tree

2 files changed

+20
-1
lines changed

2 files changed

+20
-1
lines changed

Diff for: src/ci/github-actions/jobs.yml

+19
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,25 @@ pr:
7575
<<: *job-linux-16c
7676
- image: x86_64-gnu-tools
7777
<<: *job-linux-16c
78+
- image: test-various
79+
<<: *job-linux-8c
80+
- image: i686-msvc
81+
env:
82+
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc
83+
SCRIPT: make ci-msvc
84+
<<: *job-windows-8c
85+
- image: x86_64-apple-1
86+
env:
87+
SCRIPT: ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc --skip tests/run-make-fulldeps
88+
RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc
89+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
90+
MACOSX_DEPLOYMENT_TARGET: 10.12
91+
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
92+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
93+
NO_LLVM_ASSERTIONS: 1
94+
NO_DEBUG_ASSERTIONS: 1
95+
NO_OVERFLOW_CHECKS: 1
96+
<<: *job-macos-xl
7897

7998
# Jobs that run when you perform a try build (@bors try)
8099
# These jobs automatically inherit envs.try, to avoid repeating

Diff for: src/tools/run-make-support/src/cc.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ pub fn extra_cxx_flags() -> Vec<&'static str> {
161161
if is_windows() {
162162
if is_msvc() { vec![] } else { vec!["-lstdc++"] }
163163
} else {
164-
match uname() {
164+
match &uname()[..] {
165165
"Darwin" => vec!["-lc++"],
166166
"FreeBSD" | "SunOS" | "OpenBSD" => vec![],
167167
_ => vec!["-lstdc++"],

0 commit comments

Comments
 (0)