diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-05-11 14:08:46 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-05-19 10:52:57 -0700 |
| commit | ee64bab76cdaa375cc015a5eb3e3fd7581d2a7b3 (patch) | |
| tree | 4dfc1db36db86f5ce38d66c0a246a6c61a2c7d39 | |
| parent | fcf7ecd1d709c3a4ecc652349763710914271fb0 (diff) | |
| download | rust-ee64bab76cdaa375cc015a5eb3e3fd7581d2a7b3.tar.gz rust-ee64bab76cdaa375cc015a5eb3e3fd7581d2a7b3.zip | |
mk: Don't add cross prefixes for MSVC
Currently the MSVC compilers don't have any cross prefixes and we're only able to make an MSVC compiler with a cross compile, so just avoid this logic on msvc for now.
| -rw-r--r-- | mk/platform.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mk/platform.mk b/mk/platform.mk index 53fb8138916..26a6db1c5bd 100644 --- a/mk/platform.mk +++ b/mk/platform.mk @@ -164,6 +164,7 @@ FIND_COMPILER = $(word 1,$(1:ccache=)) define CFG_MAKE_TOOLCHAIN # Prepend the tools with their prefix if cross compiling ifneq ($(CFG_BUILD),$(1)) + ifneq ($$(findstring msvc,$(1)),msvc) CC_$(1)=$(CROSS_PREFIX_$(1))$(CC_$(1)) CXX_$(1)=$(CROSS_PREFIX_$(1))$(CXX_$(1)) CPP_$(1)=$(CROSS_PREFIX_$(1))$(CPP_$(1)) @@ -173,6 +174,7 @@ define CFG_MAKE_TOOLCHAIN -C ar=$$(call FIND_COMPILER,$$(AR_$(1))) $(RUSTC_CROSS_FLAGS_$(1)) RUSTC_FLAGS_$(1)=$$(RUSTC_CROSS_FLAGS_$(1)) $(RUSTC_FLAGS_$(1)) + endif endif CFG_COMPILE_C_$(1) = $$(CC_$(1)) \ |