Skip to content

Commit 1e62548

Browse files
committed
---
yaml --- r: 207417 b: refs/heads/tmp c: ee64bab h: refs/heads/master i: 207415: 4e4f994 v: v3
1 parent cdb3906 commit 1e62548

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
3232
refs/heads/beta: cd7d89af9169885642d43597302af69f842bbd78
3333
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3434
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
35-
refs/heads/tmp: fcf7ecd1d709c3a4ecc652349763710914271fb0
35+
refs/heads/tmp: ee64bab76cdaa375cc015a5eb3e3fd7581d2a7b3
3636
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3737
refs/tags/homu-tmp: 704c2ee730d2e948d11a2edd77e3f35de8329a6e
3838
refs/heads/gate: 97c84447b65164731087ea82685580cc81424412

branches/tmp/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)