Skip to content

Commit 08077f2

Browse files
lostystyglostystyg
committed
Include windres build tool in depends toolchain
1 parent 3829be3 commit 08077f2

File tree

5 files changed

+12
-3
lines changed

5 files changed

+12
-3
lines changed

‎depends/Makefile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,15 @@ build_id_string+=$(shell $(build_AR) --version 2>/dev/null)
117117
build_id_string+=$(shell $(build_CXX) --version 2>/dev/null)
118118
build_id_string+=$(shell $(build_RANLIB) --version 2>/dev/null)
119119
build_id_string+=$(shell $(build_STRIP) --version 2>/dev/null)
120+
build_id_string+=$(shell $(build_WINDRES) --version 2>/dev/null)
120121

121122
$(host_arch)_$(host_os)_id_string:=$(HOST_ID_SALT)
122123
$(host_arch)_$(host_os)_id_string+=$(shell $(host_CC) --version 2>/dev/null)
123124
$(host_arch)_$(host_os)_id_string+=$(shell $(host_AR) --version 2>/dev/null)
124125
$(host_arch)_$(host_os)_id_string+=$(shell $(host_CXX) --version 2>/dev/null)
125126
$(host_arch)_$(host_os)_id_string+=$(shell $(host_RANLIB) --version 2>/dev/null)
126127
$(host_arch)_$(host_os)_id_string+=$(shell $(host_STRIP) --version 2>/dev/null)
128+
$(host_arch)_$(host_os)_id_string+=$(shell $(host_WINDRES) --version 2>/dev/null)
127129

128130
ifneq ($(strip $(FORCE_USE_SYSTEM_CLANG)),)
129131
build_id_string+=system_clang
@@ -186,6 +188,7 @@ $(host_prefix)/share/config.site : config.site.in $(host_prefix)/.stamp_$(final_
186188
-e 's|@CXX@|$(toolchain_path)$(host_CXX)|' \
187189
-e 's|@AR@|$(binutils_path)$(host_AR)|' \
188190
-e 's|@RANLIB@|$(binutils_path)$(host_RANLIB)|' \
191+
-e 's|@WINDRES@|$(binutils_path)$(host_WINDRES)|' \
189192
-e 's|@NM@|$(binutils_path)$(host_NM)|' \
190193
-e 's|@STRIP@|$(binutils_path)$(host_STRIP)|' \
191194
-e 's|@build_os@|$(build_os)|' \

‎depends/builders/default.mk‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ default_build_AR = ar
44
default_build_TAR = tar
55
default_build_RANLIB = ranlib
66
default_build_STRIP = strip
7+
default_build_WINDRES = windres
78
default_build_NM = nm
89
default_build_OTOOL = otool
910
default_build_INSTALL_NAME_TOOL = install_name_tool
@@ -13,7 +14,7 @@ build_$(build_os)_$1 ?= $$(default_build_$1)
1314
build_$(build_arch)_$(build_os)_$1 ?= $$(build_$(build_os)_$1)
1415
build_$1=$$(build_$(build_arch)_$(build_os)_$1)
1516
endef
16-
$(foreach var,CC CXX AR TAR RANLIB NM STRIP SHA256SUM DOWNLOAD OTOOL INSTALL_NAME_TOOL,$(eval $(call add_build_tool_func,$(var))))
17+
$(foreach var,CC CXX AR TAR RANLIB WINDRES NM STRIP SHA256SUM DOWNLOAD OTOOL INSTALL_NAME_TOOL,$(eval $(call add_build_tool_func,$(var))))
1718
define add_build_flags_func
1819
build_$(build_arch)_$(build_os)_$1 += $(build_$(build_os)_$1)
1920
build_$1=$$(build_$(build_arch)_$(build_os)_$1)

‎depends/funcs.mk‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ $(1)_objc=$($($(1)_type)_OBJC)
66
$(1)_objcxx=$($($(1)_type)_OBJCXX)
77
$(1)_ar=$($($(1)_type)_AR)
88
$(1)_ranlib=$($($(1)_type)_RANLIB)
9+
$(1)_windres=$($($(1)_type)_WINDRES)
910
$(1)_libtool=$($($(1)_type)_LIBTOOL)
1011
$(1)_nm=$($($(1)_type)_NM)
1112
$(1)_cflags=$($($(1)_type)_CFLAGS) $($($(1)_type)_$(release_type)_CFLAGS)
@@ -142,6 +143,9 @@ endif
142143
ifneq ($($(1)_ranlib),)
143144
$(1)_autoconf += RANLIB="$$($(1)_ranlib)"
144145
endif
146+
ifneq ($($(1)_windres),)
147+
$(1)_autoconf += WINDRES="$$($(1)_windres)"
148+
endif
145149
ifneq ($($(1)_ar),)
146150
$(1)_autoconf += AR="$$($(1)_ar)"
147151
endif

‎depends/hosts/default.mk‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ default_host_CC = $(host_toolchain)gcc
66
default_host_CXX = $(host_toolchain)g++
77
default_host_AR = $(host_toolchain)ar
88
default_host_RANLIB = $(host_toolchain)ranlib
9+
default_host_WINDRES = $(host_toolchain)windres
910
default_host_STRIP = $(host_toolchain)strip
1011
default_host_LIBTOOL = $(host_toolchain)libtool
1112
default_host_INSTALL_NAME_TOOL = $(host_toolchain)install_name_tool
@@ -35,5 +36,5 @@ host_$1 = $$($(host_arch)_$(host_os)_$1)
3536
host_$(release_type)_$1 = $$($(host_arch)_$(host_os)_$(release_type)_$1)
3637
endef
3738

38-
$(foreach tool,CC CXX AR RANLIB STRIP NM LIBTOOL OTOOL INSTALL_NAME_TOOL,$(eval $(call add_host_tool_func,$(tool))))
39+
$(foreach tool,CC CXX AR RANLIB STRIP NM LIBTOOL OTOOL WINDRES INSTALL_NAME_TOOL,$(eval $(call add_host_tool_func,$(tool))))
3940
$(foreach flags,CFLAGS CXXFLAGS CPPFLAGS LDFLAGS, $(eval $(call add_host_flags_func,$(flags))))

‎depends/packages/openssl.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ $(package)_file_name=$(package)-$($(package)_version).tar.gz
55
$(package)_sha256_hash=cf3098950cb4d853ad95c0841f1f9c6d3dc102dccfcacd521d93925208b76ac8
66

77
define $(package)_set_vars
8-
$(package)_config_env=AR="$($(package)_ar)" RANLIB="$($(package)_ranlib)" CC="$($(package)_cc)"
8+
$(package)_config_env=AR="$($(package)_ar)" RANLIB="$($(package)_ranlib)" CC="$($(package)_cc)" WINDRES="$($(package)_windres)"
99
$(package)_config_opts=--prefix=$(host_prefix) --openssldir=$(host_prefix)/etc/openssl
1010
$(package)_config_opts+=no-camellia
1111
$(package)_config_opts+=no-capieng

0 commit comments

Comments
 (0)