Просмотр исходного кода

meson: prepare to use different linkers

This sets the default linker for cross compilation.

No functional change intended.

Signed-off-by: Andre Heider <[email protected]>
Andre Heider 2 лет назад
Родитель
Сommit
ca788d615f
3 измененных файлов с 4 добавлено и 0 удалено
  1. 1 0
      include/meson.mk
  2. 1 0
      tools/meson/Makefile
  3. 2 0
      tools/meson/files/openwrt-cross.txt.in

+ 1 - 0
include/meson.mk

@@ -78,6 +78,7 @@ define Meson/CreateCrossFile
 	$(STAGING_DIR_HOST)/bin/sed \
 		-e "s|@CC@|$(foreach BIN,$(TARGET_CC),'$(BIN)',)|" \
 		-e "s|@CXX@|$(foreach BIN,$(TARGET_CXX),'$(BIN)',)|" \
+		-e "s|@LD@|$(foreach FLAG,$(TARGET_LINKER),'$(FLAG)',)|" \
 		-e "s|@AR@|$(TARGET_AR)|" \
 		-e "s|@STRIP@|$(TARGET_CROSS)strip|" \
 		-e "s|@NM@|$(TARGET_NM)|" \

+ 1 - 0
tools/meson/Makefile

@@ -2,6 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=meson
 PKG_VERSION:=1.1.1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/mesonbuild/meson/releases/download/$(PKG_VERSION)

+ 2 - 0
tools/meson/files/openwrt-cross.txt.in

@@ -1,6 +1,8 @@
 [binaries]
 c = [@CC@]
+c_ld = [@LD@]
 cpp = [@CXX@]
+cpp_ld = [@LD@]
 ar = '@AR@'
 strip = '@STRIP@'
 nm = '@NM@'