Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion mk/cfg/aarch64-linux-android.mk
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# aarch64-linux-android configuration
# CROSS_PREFIX_aarch64-linux-android-
CC_aarch64-linux-android=$(CFG_ANDROID_CROSS_PATH)/bin/aarch64-linux-android-gcc
LINK_aarch64-linux-android=$(CFG_ANDROID_CROSS_PATH)/bin/aarch64-linux-android-gcc
CXX_aarch64-linux-android=$(CFG_ANDROID_CROSS_PATH)/bin/aarch64-linux-android-g++
CPP_aarch64-linux-android=$(CFG_ANDROID_CROSS_PATH)/bin/aarch64-linux-android-gcc -E
AR_aarch64-linux-android=$(CFG_ANDROID_CROSS_PATH)/bin/aarch64-linux-android-ar
Expand Down
1 change: 0 additions & 1 deletion mk/cfg/aarch64-unknown-linux-gnu.mk
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# aarch64-unknown-linux-gnu configuration
CROSS_PREFIX_aarch64-unknown-linux-gnu=aarch64-linux-gnu-
CC_aarch64-unknown-linux-gnu=gcc
LINK_aarch64-unknown-linux-gnu=gcc
CXX_aarch64-unknown-linux-gnu=g++
CPP_aarch64-unknown-linux-gnu=gcc -E
AR_aarch64-unknown-linux-gnu=ar
Expand Down
1 change: 0 additions & 1 deletion mk/cfg/arm-linux-androideabi.mk
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# arm-linux-androideabi configuration
LINK_arm-linux-androideabi=$(CFG_ANDROID_CROSS_PATH)/bin/arm-linux-androideabi-gcc
CC_arm-linux-androideabi=$(CFG_ANDROID_CROSS_PATH)/bin/arm-linux-androideabi-gcc
CXX_arm-linux-androideabi=$(CFG_ANDROID_CROSS_PATH)/bin/arm-linux-androideabi-g++
CPP_arm-linux-androideabi=$(CFG_ANDROID_CROSS_PATH)/bin/arm-linux-androideabi-gcc -E
Expand Down
1 change: 0 additions & 1 deletion mk/cfg/i686-apple-darwin.mk
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# i686-apple-darwin configuration
CC_i686-apple-darwin=$(CC)
LINK_i686-apple-darwin=cc
CXX_i686-apple-darwin=$(CXX)
CPP_i686-apple-darwin=$(CPP)
AR_i686-apple-darwin=$(AR)
Expand Down
1 change: 0 additions & 1 deletion mk/cfg/i686-unknown-linux-gnu.mk
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# i686-unknown-linux-gnu configuration
CC_i686-unknown-linux-gnu=$(CC)
LINK_i686-unknown-linux-gnu=cc
CXX_i686-unknown-linux-gnu=$(CXX)
CPP_i686-unknown-linux-gnu=$(CPP)
AR_i686-unknown-linux-gnu=$(AR)
Expand Down
1 change: 0 additions & 1 deletion mk/cfg/x86_64-apple-darwin.mk
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# x86_64-apple-darwin configuration
CC_x86_64-apple-darwin=$(CC)
LINK_x86_64-apple-darwin=cc
CXX_x86_64-apple-darwin=$(CXX)
CPP_x86_64-apple-darwin=$(CPP)
AR_x86_64-apple-darwin=$(AR)
Expand Down
1 change: 0 additions & 1 deletion mk/cfg/x86_64-pc-windows-gnu.mk
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# x86_64-pc-windows-gnu configuration
CROSS_PREFIX_x86_64-pc-windows-gnu=x86_64-w64-mingw32-
CC_x86_64-pc-windows-gnu=gcc
LINK_x86_64-pc-windows-gnu=gcc
CXX_x86_64-pc-windows-gnu=g++
CPP_x86_64-pc-windows-gnu=gcc -E
AR_x86_64-pc-windows-gnu=ar
Expand Down
1 change: 0 additions & 1 deletion mk/cfg/x86_64-unknown-linux-gnu.mk
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# x86_64-unknown-linux-gnu configuration
CC_x86_64-unknown-linux-gnu=$(CC)
LINK_x86_64-unknown-linux-gnu=cc
CXX_x86_64-unknown-linux-gnu=$(CXX)
CPP_x86_64-unknown-linux-gnu=$(CPP)
AR_x86_64-unknown-linux-gnu=$(AR)
Expand Down
9 changes: 9 additions & 0 deletions mk/platform.mk
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,15 @@ endef
$(foreach target,$(CFG_TARGET), \
$(eval $(call ADD_INSTALLED_OBJECTS,$(target))))

define DEFINE_LINKER
ifndef LINK_$(1)
LINK_$(1) := $$(CC_$(1))
endif
endef

$(foreach target,$(CFG_TARGET), \
$(eval $(call DEFINE_LINKER,$(target))))

# The -Qunused-arguments sidesteps spurious warnings from clang
define FILTER_FLAGS
ifeq ($$(CFG_USING_CLANG),1)
Expand Down