diff options
| author | bors <bors@rust-lang.org> | 2015-08-11 07:48:39 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-08-11 07:48:39 +0000 |
| commit | 23f43896ce92830173e503eab8b2f7fba8137e37 (patch) | |
| tree | 0a61a110206a22fdb6f037bb1992486fbcbb4560 | |
| parent | f1ae605db8944f874994bab2879819f86f0250e2 (diff) | |
| parent | 138252cc6a59420144b261a6537dcc2d95551981 (diff) | |
| download | rust-23f43896ce92830173e503eab8b2f7fba8137e37.tar.gz rust-23f43896ce92830173e503eab8b2f7fba8137e37.zip | |
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!
| -rw-r--r-- | mk/platform.mk | 3 | ||||
| -rw-r--r-- | mk/target.mk | 6 | ||||
| -rw-r--r-- | src/librustc_back/target/windows_msvc_base.rs | 1 |
3 files changed, 10 insertions, 0 deletions
diff --git a/mk/platform.mk b/mk/platform.mk index 082c0d526a0..9a6de772ab4 100644 --- a/mk/platform.mk +++ b/mk/platform.mk @@ -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 diff --git a/mk/target.mk b/mk/target.mk index cd22a77bd22..63ce003c810 100644 --- a/mk/target.mk +++ b/mk/target.mk @@ -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) @@ -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): \ diff --git a/src/librustc_back/target/windows_msvc_base.rs b/src/librustc_back/target/windows_msvc_base.rs index bdc60cbc1ba..2466c254e05 100644 --- a/src/librustc_back/target/windows_msvc_base.rs +++ b/src/librustc_back/target/windows_msvc_base.rs @@ -59,6 +59,7 @@ pub fn opts() -> TargetOptions { "/NOLOGO".to_string(), "/NXCOMPAT".to_string(), ], + archive_format: "gnu".to_string(), .. Default::default() } |