Skip to content

Commit 2c718b1

Browse files
committed
---
yaml --- r: 225319 b: refs/heads/stable c: 47f9e52 h: refs/heads/master i: 225317: 6fe9dc1 225315: 65e1f0a 225311: b9f42c3 v: v3
1 parent b54025d commit 2c718b1

10 files changed

+10
-9
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ refs/heads/tmp: e5d90d98402475b6e154ce216f9efcb80da1a747
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3030
refs/tags/homu-tmp: 1fe32ca12c51afcd761d9962f51a74ff0d07a591
3131
refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
32-
refs/heads/stable: 6090d15e93ae4ffe06bd87568d9eac8d0013e61b
32+
refs/heads/stable: 47f9e528f13403f48dc0521f360055430da6d538
3333
refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
3434
refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b

branches/stable/mk/cfg/aarch64-linux-android.mk

Lines changed: 0 additions & 1 deletion
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

branches/stable/mk/cfg/aarch64-unknown-linux-gnu.mk

Lines changed: 0 additions & 1 deletion
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

branches/stable/mk/cfg/arm-linux-androideabi.mk

Lines changed: 0 additions & 1 deletion
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

branches/stable/mk/cfg/i686-apple-darwin.mk

Lines changed: 0 additions & 1 deletion
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)

branches/stable/mk/cfg/i686-unknown-linux-gnu.mk

Lines changed: 0 additions & 1 deletion
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)

branches/stable/mk/cfg/x86_64-apple-darwin.mk

Lines changed: 0 additions & 1 deletion
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)

branches/stable/mk/cfg/x86_64-pc-windows-gnu.mk

Lines changed: 0 additions & 1 deletion
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

branches/stable/mk/cfg/x86_64-unknown-linux-gnu.mk

Lines changed: 0 additions & 1 deletion
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)

branches/stable/mk/platform.mk

Lines changed: 9 additions & 0 deletions
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)