Skip to content

Commit ee64bab

Browse files
committed
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.
1 parent fcf7ecd commit ee64bab

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

mk/platform.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ FIND_COMPILER = $(word 1,$(1:ccache=))
164164
define CFG_MAKE_TOOLCHAIN
165165
# Prepend the tools with their prefix if cross compiling
166166
ifneq ($(CFG_BUILD),$(1))
167+
ifneq ($$(findstring msvc,$(1)),msvc)
167168
CC_$(1)=$(CROSS_PREFIX_$(1))$(CC_$(1))
168169
CXX_$(1)=$(CROSS_PREFIX_$(1))$(CXX_$(1))
169170
CPP_$(1)=$(CROSS_PREFIX_$(1))$(CPP_$(1))
@@ -173,6 +174,7 @@ define CFG_MAKE_TOOLCHAIN
173174
-C ar=$$(call FIND_COMPILER,$$(AR_$(1))) $(RUSTC_CROSS_FLAGS_$(1))
174175

175176
RUSTC_FLAGS_$(1)=$$(RUSTC_CROSS_FLAGS_$(1)) $(RUSTC_FLAGS_$(1))
177+
endif
176178
endif
177179

178180
CFG_COMPILE_C_$(1) = $$(CC_$(1)) \

0 commit comments

Comments
 (0)