Skip to content

Commit af60248

Browse files
borsbors
committed
Auto merge of #25799 - alexcrichton:fix-link-in-mk, r=luqmana
The changes scaled back in 4cc025d were a little too aggressive and broke a bunch of cross compilations by not defining the `LINK_$(1)` variable for all targets. This commit ensures that the variable is defined for all targets by defaulting it to the normal compiler if it's not already defined (it's only defined specially for MSVC). Closes #25723 Closes #25802
2 parents efcc1d1 + bc7c62d commit af60248

9 files changed

+9
-8
lines changed

Diff for: ‎mk/cfg/aarch64-linux-android.mk

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# aarch64-linux-android configuration
22
# CROSS_PREFIX_aarch64-linux-android-
33
CC_aarch64-linux-android=$(CFG_ANDROID_CROSS_PATH)/bin/aarch64-linux-android-gcc
4-
LINK_aarch64-linux-android=$(CFG_ANDROID_CROSS_PATH)/bin/aarch64-linux-android-gcc
54
CXX_aarch64-linux-android=$(CFG_ANDROID_CROSS_PATH)/bin/aarch64-linux-android-g++
65
CPP_aarch64-linux-android=$(CFG_ANDROID_CROSS_PATH)/bin/aarch64-linux-android-gcc -E
76
AR_aarch64-linux-android=$(CFG_ANDROID_CROSS_PATH)/bin/aarch64-linux-android-ar

Diff for: ‎mk/cfg/aarch64-unknown-linux-gnu.mk

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# aarch64-unknown-linux-gnu configuration
22
CROSS_PREFIX_aarch64-unknown-linux-gnu=aarch64-linux-gnu-
33
CC_aarch64-unknown-linux-gnu=gcc
4-
LINK_aarch64-unknown-linux-gnu=gcc
54
CXX_aarch64-unknown-linux-gnu=g++
65
CPP_aarch64-unknown-linux-gnu=gcc -E
76
AR_aarch64-unknown-linux-gnu=ar

Diff for: ‎mk/cfg/arm-linux-androideabi.mk

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# arm-linux-androideabi configuration
2-
LINK_arm-linux-androideabi=$(CFG_ANDROID_CROSS_PATH)/bin/arm-linux-androideabi-gcc
32
CC_arm-linux-androideabi=$(CFG_ANDROID_CROSS_PATH)/bin/arm-linux-androideabi-gcc
43
CXX_arm-linux-androideabi=$(CFG_ANDROID_CROSS_PATH)/bin/arm-linux-androideabi-g++
54
CPP_arm-linux-androideabi=$(CFG_ANDROID_CROSS_PATH)/bin/arm-linux-androideabi-gcc -E

Diff for: ‎mk/cfg/i686-apple-darwin.mk

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

Diff for: ‎mk/cfg/i686-unknown-linux-gnu.mk

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

Diff for: ‎mk/cfg/x86_64-apple-darwin.mk

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

Diff for: ‎mk/cfg/x86_64-pc-windows-gnu.mk

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# x86_64-pc-windows-gnu configuration
22
CROSS_PREFIX_x86_64-pc-windows-gnu=x86_64-w64-mingw32-
33
CC_x86_64-pc-windows-gnu=gcc
4-
LINK_x86_64-pc-windows-gnu=gcc
54
CXX_x86_64-pc-windows-gnu=g++
65
CPP_x86_64-pc-windows-gnu=gcc -E
76
AR_x86_64-pc-windows-gnu=ar

Diff for: ‎mk/cfg/x86_64-unknown-linux-gnu.mk

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

Diff for: ‎mk/platform.mk

+9
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,15 @@ endef
120120
$(foreach target,$(CFG_TARGET), \
121121
$(eval $(call ADD_INSTALLED_OBJECTS,$(target))))
122122

123+
define DEFINE_LINKER
124+
ifndef LINK_$(1)
125+
LINK_$(1) := $$(CC_$(1))
126+
endif
127+
endef
128+
129+
$(foreach target,$(CFG_TARGET), \
130+
$(eval $(call DEFINE_LINKER,$(target))))
131+
123132
# The -Qunused-arguments sidesteps spurious warnings from clang
124133
define FILTER_FLAGS
125134
ifeq ($$(CFG_USING_CLANG),1)

0 commit comments

Comments
 (0)