Skip to content

Commit 0fc0476

Browse files
borsbors
committed
Auto merge of #25719 - brson:crosslink, r=eddyb
The recent MSVC patch made the build system pass explicit linkers to rustc, but did not set that up for anything other than MSVC. This is blocking nightlies.
2 parents 0c2642a + 1cda323 commit 0fc0476

4 files changed

+4
-0
lines changed

‎mk/cfg/i686-apple-darwin.mk

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# i686-apple-darwin configuration
22
CC_i686-apple-darwin=$(CC)
3+
LINK_i686-apple-darwin=cc
34
CXX_i686-apple-darwin=$(CXX)
45
CPP_i686-apple-darwin=$(CPP)
56
AR_i686-apple-darwin=$(AR)

‎mk/cfg/i686-unknown-linux-gnu.mk

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# i686-unknown-linux-gnu configuration
22
CC_i686-unknown-linux-gnu=$(CC)
3+
LINK_i686-unknown-linux-gnu=cc
34
CXX_i686-unknown-linux-gnu=$(CXX)
45
CPP_i686-unknown-linux-gnu=$(CPP)
56
AR_i686-unknown-linux-gnu=$(AR)

‎mk/cfg/x86_64-apple-darwin.mk

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# x86_64-apple-darwin configuration
22
CC_x86_64-apple-darwin=$(CC)
3+
LINK_x86_64-apple-darwin=cc
34
CXX_x86_64-apple-darwin=$(CXX)
45
CPP_x86_64-apple-darwin=$(CPP)
56
AR_x86_64-apple-darwin=$(AR)

‎mk/cfg/x86_64-unknown-linux-gnu.mk

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# x86_64-unknown-linux-gnu configuration
22
CC_x86_64-unknown-linux-gnu=$(CC)
3+
LINK_x86_64-unknown-linux-gnu=cc
34
CXX_x86_64-unknown-linux-gnu=$(CXX)
45
CPP_x86_64-unknown-linux-gnu=$(CPP)
56
AR_x86_64-unknown-linux-gnu=$(AR)

0 commit comments

Comments
 (0)