Skip to content

Commit affbf58

Browse files
committed
build: Move environment variables into $(package)_config_env
1 parent d44fcd3 commit affbf58

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

depends/funcs.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ $(1)_config_env+=$($(1)_config_env_$(host_arch)_$(host_os)) $($(1)_config_env_$(
137137

138138
$(1)_config_env+=PKG_CONFIG_LIBDIR=$($($(1)_type)_prefix)/lib/pkgconfig
139139
$(1)_config_env+=PKG_CONFIG_PATH=$($($(1)_type)_prefix)/share/pkgconfig
140+
$(1)_config_env+=PKG_CONFIG_SYSROOT_DIR=/
140141
$(1)_config_env+=CMAKE_MODULE_PATH=$($($(1)_type)_prefix)/lib/cmake
141142
$(1)_config_env+=PATH=$(build_prefix)/bin:$(PATH)
142143
$(1)_build_env+=PATH=$(build_prefix)/bin:$(PATH)

depends/packages/qt.mk

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ $(package)_extra_sources = $($(package)_qttranslations_file_name)
3333
$(package)_extra_sources += $($(package)_qttools_file_name)
3434

3535
define $(package)_set_vars
36+
$(package)_config_env = QT_MAC_SDK_NO_VERSION_CHECK=1
3637
$(package)_config_opts_release = -release
3738
$(package)_config_opts_release += -silent
3839
$(package)_config_opts_debug = -debug
@@ -261,9 +262,6 @@ define $(package)_preprocess_cmds
261262
endef
262263

263264
define $(package)_config_cmds
264-
export PKG_CONFIG_SYSROOT_DIR=/ && \
265-
export PKG_CONFIG_LIBDIR=$(host_prefix)/lib/pkgconfig && \
266-
export QT_MAC_SDK_NO_VERSION_CHECK=1 && \
267265
cd qtbase && \
268266
./configure -top-level $($(package)_config_opts)
269267
endef

0 commit comments

Comments
 (0)