OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #27518 - alexcrichton:msvc-builtin-llvm-ar, r=huonw

Browse Source 
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!
This commit is contained in:
bors 2015-08-11 07:48:39 +00:00
commit 23f43896ce
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mk/platform.mk
View File

@ -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` # 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 # instead of `lib.exe` for assembling archives, so we need to inject this custom
# dependency here. # 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 define ADD_LLVM_AR_TO_MSVC_DEPS
ifeq ($$(findstring msvc,$(1)),msvc) ifeq ($$(findstring msvc,$(1)),msvc)
NATIVE_TOOL_DEPS_core_T_$(1) += llvm-ar.exe NATIVE_TOOL_DEPS_core_T_$(1) += llvm-ar.exe

6
mk/target.mk
View File

@ -205,6 +205,9 @@ $(foreach host,$(CFG_HOST), \
# $(3) - triple snapshot is built for # $(3) - triple snapshot is built for
# $(4) - crate # $(4) - crate
# $(5) - tool # $(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 define MOVE_TOOLS_TO_SNAPSHOT_HOST_DIR
ifneq (,$(3)) ifneq (,$(3))
$$(TLIB$(1)_T_$(2)_H_$(2))/stamp.$(4): $$(HLIB$(1)_H_$(2))/rustlib/$(3)/bin/$(5) $$(TLIB$(1)_T_$(2)_H_$(2))/stamp.$(4): $$(HLIB$(1)_H_$(2))/rustlib/$(3)/bin/$(5)
@ -229,6 +232,9 @@ $(foreach target,$(CFG_TARGET), \
# path instead of MinGW's /usr/bin/link.exe (entirely unrelated) # path instead of MinGW's /usr/bin/link.exe (entirely unrelated)
# #
# The values for these variables are detected by the configure script. # 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 define SETUP_LIB_MSVC_ENV_VARS
ifeq ($$(findstring msvc,$(2)),msvc) ifeq ($$(findstring msvc,$(2)),msvc)
$$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): \ $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): \

1
src/librustc_back/target/windows_msvc_base.rs
View File

@ -59,6 +59,7 @@ pub fn opts() -> TargetOptions {
"/NOLOGO".to_string(), "/NOLOGO".to_string(),
"/NXCOMPAT".to_string(), "/NXCOMPAT".to_string(),
], ],
archive_format: "gnu".to_string(),
.. Default::default() .. Default::default()
} }