Skip to content

Commit

Permalink
Auto merge of #27518 - alexcrichton:msvc-builtin-llvm-ar, r=huonw
Browse files Browse the repository at this point in the history
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!
  • Loading branch information
bors committed Aug 11, 2015
2 parents f1ae605 + 138252c commit 23f4389
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 0 deletions.
3 changes: 3 additions & 0 deletions mk/platform.mk
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,9 @@ $(foreach target,$(CFG_TARGET), \
# Windows MSVC in the compiler, but the gist of it is that we use `llvm-ar.exe`
# instead of `lib.exe` for assembling archives, so we need to inject this custom
# dependency here.
#
# FIXME(stage0): remove this and all other relevant support in the makefiles
# after a snapshot is made
define ADD_LLVM_AR_TO_MSVC_DEPS
ifeq ($$(findstring msvc,$(1)),msvc)
NATIVE_TOOL_DEPS_core_T_$(1) += llvm-ar.exe
Expand Down
6 changes: 6 additions & 0 deletions mk/target.mk
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,9 @@ $(foreach host,$(CFG_HOST), \
# $(3) - triple snapshot is built for
# $(4) - crate
# $(5) - tool
#
# FIXME(stage0): remove this and all other relevant support in the makefiles
# after a snapshot is made
define MOVE_TOOLS_TO_SNAPSHOT_HOST_DIR
ifneq (,$(3))
$$(TLIB$(1)_T_$(2)_H_$(2))/stamp.$(4): $$(HLIB$(1)_H_$(2))/rustlib/$(3)/bin/$(5)
Expand All @@ -229,6 +232,9 @@ $(foreach target,$(CFG_TARGET), \
# path instead of MinGW's /usr/bin/link.exe (entirely unrelated)
#
# The values for these variables are detected by the configure script.
#
# FIXME(stage0): remove this and all other relevant support in the makefiles
# after a snapshot is made
define SETUP_LIB_MSVC_ENV_VARS
ifeq ($$(findstring msvc,$(2)),msvc)
$$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): \
Expand Down
1 change: 1 addition & 0 deletions src/librustc_back/target/windows_msvc_base.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ pub fn opts() -> TargetOptions {
"/NOLOGO".to_string(),
"/NXCOMPAT".to_string(),
],
archive_format: "gnu".to_string(),

.. Default::default()
}
Expand Down

0 comments on commit 23f4389

Please sign in to comment.