diff options
| author | Howard Chu <hyc@symas.com> | 2021-11-30 01:25:02 +0000 |
|---|---|---|
| committer | Howard Chu <hyc@symas.com> | 2021-11-30 04:15:48 +0000 |
| commit | 6e6ad80dc40db5fa41a50fc5b2973ec67ff67cd4 (patch) | |
| tree | eb6b1f9ad7117a72b5ec502913698bc6affc4587 /contrib/depends/funcs.mk | |
| parent | Merge pull request #7910 (diff) | |
| download | monero-6e6ad80dc40db5fa41a50fc5b2973ec67ff67cd4.tar.xz | |
Fix Android OpenSSL build
depends didn't have target-specific overrides for _build_env
so ANDROID_NDK_HOME wasn't being set at build time.
This fix supersedes the manual edit of Configuration/15-android.conf.
Resolves #8095
Diffstat (limited to 'contrib/depends/funcs.mk')
| -rw-r--r-- | contrib/depends/funcs.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/contrib/depends/funcs.mk b/contrib/depends/funcs.mk index ffda2b5b2..804125990 100644 --- a/contrib/depends/funcs.mk +++ b/contrib/depends/funcs.mk @@ -133,6 +133,11 @@ $(1)_config_env+=$($(1)_config_env_$(host_arch)) $($(1)_config_env_$(host_arch)_ $(1)_config_env+=$($(1)_config_env_$(host_os)) $($(1)_config_env_$(host_os)_$(release_type)) $(1)_config_env+=$($(1)_config_env_$(host_arch)_$(host_os)) $($(1)_config_env_$(host_arch)_$(host_os)_$(release_type)) +$(1)_build_env+=$$($(1)_build_env_$(release_type)) +$(1)_build_env+=$($(1)_build_env_$(host_arch)) $($(1)_build_env_$(host_arch)_$(release_type)) +$(1)_build_env+=$($(1)_build_env_$(host_os)) $($(1)_build_env_$(host_os)_$(release_type)) +$(1)_build_env+=$($(1)_build_env_$(host_arch)_$(host_os)) $($(1)_build_env_$(host_arch)_$(host_os)_$(release_type)) + $(1)_config_env+=PKG_CONFIG_LIBDIR=$($($(1)_type)_prefix)/lib/pkgconfig $(1)_config_env+=PKG_CONFIG_PATH=$($($(1)_type)_prefix)/share/pkgconfig $(1)_config_env+=PATH="$(build_prefix)/bin:$(PATH)" |