Skip to content

Commit fb47bda

Browse files
Add host= configuration for msvc/darwin
1 parent d778203 commit fb47bda

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

.github/workflows/ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -444,13 +444,13 @@ jobs:
444444
os: windows-latest-xl
445445
- name: dist-x86_64-msvc
446446
env:
447-
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --target=x86_64-pc-windows-msvc,aarch64-pc-windows-msvc --enable-full-tools --enable-profiler"
447+
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --host=x86_64-pc-windows-msvc --target=x86_64-pc-windows-msvc,aarch64-pc-windows-msvc --enable-full-tools --enable-profiler"
448448
SCRIPT: python x.py dist
449449
DIST_REQUIRE_ALL_TOOLS: 1
450450
os: windows-latest-xl
451451
- name: dist-i686-msvc
452452
env:
453-
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-msvc --target=i586-pc-windows-msvc --enable-full-tools --enable-profiler"
453+
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-msvc --host=i686-pc-windows-msvc --target=i586-pc-windows-msvc --enable-full-tools --enable-profiler"
454454
SCRIPT: python x.py dist
455455
DIST_REQUIRE_ALL_TOOLS: 1
456456
os: windows-latest-xl
@@ -583,7 +583,7 @@ jobs:
583583
- name: dist-x86_64-apple
584584
env:
585585
SCRIPT: "./x.py dist"
586-
RUST_CONFIGURE_ARGS: "--target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
586+
RUST_CONFIGURE_ARGS: "--host=x86_64-apple-darwin --target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
587587
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
588588
MACOSX_DEPLOYMENT_TARGET: 10.7
589589
NO_LLVM_ASSERTIONS: 1

src/ci/azure-pipelines/auto.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646

4747
dist-x86_64-apple:
4848
SCRIPT: ./x.py dist
49-
INITIAL_RUST_CONFIGURE_ARGS: --target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false
49+
INITIAL_RUST_CONFIGURE_ARGS: --host=x86_64-apple-darwin --target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false
5050
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
5151
MACOSX_DEPLOYMENT_TARGET: 10.7
5252
NO_LLVM_ASSERTIONS: 1

src/ci/github-actions/ci.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ jobs:
491491
#
492492
# We are using MinGW with POSIX threads since LLVM requires
493493
# C++'s std::thread which is disabled in libstdc++ with win32 threads.
494-
# FIXME: Libc++ doesn't have this limitation so we can avoid
494+
# FIXME: Libc++ doesn't have this limitation so we can avoid
495495
# winpthreads if we switch to it.
496496
#
497497
# Instead of relying on the MinGW version installed on CI we download
@@ -541,6 +541,7 @@ jobs:
541541
env:
542542
RUST_CONFIGURE_ARGS: >-
543543
--build=x86_64-pc-windows-msvc
544+
--host=x86_64-pc-windows-msvc
544545
--target=x86_64-pc-windows-msvc,aarch64-pc-windows-msvc
545546
--enable-full-tools
546547
--enable-profiler
@@ -552,6 +553,7 @@ jobs:
552553
env:
553554
RUST_CONFIGURE_ARGS: >-
554555
--build=i686-pc-windows-msvc
556+
--host=i686-pc-windows-msvc
555557
--target=i586-pc-windows-msvc
556558
--enable-full-tools
557559
--enable-profiler
@@ -605,7 +607,7 @@ jobs:
605607
- name: dist-x86_64-apple
606608
env:
607609
SCRIPT: ./x.py dist
608-
RUST_CONFIGURE_ARGS: --target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false
610+
RUST_CONFIGURE_ARGS: --host=x86_64-apple-darwin --target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false
609611
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
610612
MACOSX_DEPLOYMENT_TARGET: 10.7
611613
NO_LLVM_ASSERTIONS: 1

0 commit comments

Comments
 (0)