Skip to content

Commit 23f4389

Browse files
committed
Auto merge of #27518 - alexcrichton:msvc-builtin-llvm-ar, r=huonw
This means that we no longer need to ship the `llvm-ar.exe` binary in the MSVC distribution, and after a snapshot we can remove a good bit of logic from the makefiles!
2 parents f1ae605 + 138252c commit 23f4389

File tree

3 files changed

+10
-0
lines changed

3 files changed

+10
-0
lines changed

mk/platform.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,9 @@ $(foreach target,$(CFG_TARGET), \
242242
# Windows MSVC in the compiler, but the gist of it is that we use `llvm-ar.exe`
243243
# instead of `lib.exe` for assembling archives, so we need to inject this custom
244244
# dependency here.
245+
#
246+
# FIXME(stage0): remove this and all other relevant support in the makefiles
247+
# after a snapshot is made
245248
define ADD_LLVM_AR_TO_MSVC_DEPS
246249
ifeq ($$(findstring msvc,$(1)),msvc)
247250
NATIVE_TOOL_DEPS_core_T_$(1) += llvm-ar.exe

mk/target.mk

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,9 @@ $(foreach host,$(CFG_HOST), \
205205
# $(3) - triple snapshot is built for
206206
# $(4) - crate
207207
# $(5) - tool
208+
#
209+
# FIXME(stage0): remove this and all other relevant support in the makefiles
210+
# after a snapshot is made
208211
define MOVE_TOOLS_TO_SNAPSHOT_HOST_DIR
209212
ifneq (,$(3))
210213
$$(TLIB$(1)_T_$(2)_H_$(2))/stamp.$(4): $$(HLIB$(1)_H_$(2))/rustlib/$(3)/bin/$(5)
@@ -229,6 +232,9 @@ $(foreach target,$(CFG_TARGET), \
229232
# path instead of MinGW's /usr/bin/link.exe (entirely unrelated)
230233
#
231234
# The values for these variables are detected by the configure script.
235+
#
236+
# FIXME(stage0): remove this and all other relevant support in the makefiles
237+
# after a snapshot is made
232238
define SETUP_LIB_MSVC_ENV_VARS
233239
ifeq ($$(findstring msvc,$(2)),msvc)
234240
$$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): \

src/librustc_back/target/windows_msvc_base.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ pub fn opts() -> TargetOptions {
5959
"/NOLOGO".to_string(),
6060
"/NXCOMPAT".to_string(),
6161
],
62+
archive_format: "gnu".to_string(),
6263

6364
.. Default::default()
6465
}

0 commit comments

Comments
 (0)