foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-22 12:23:34 -05:00
Code Issues Activity

depends: Make default host and build comparable

Browse source 
To detect cross-compiling, the host and build platforms are compared.
The `build` variable is always an output of `config.sub`, but the `host`
is not. This can lead to false results. For example, on OpenBSD:
 - host=amd64-unknown-openbsd7.5
 - build=x86_64-unknown-openbsd7.5

This change sets the default value of the `host` variable to the value
of `build`, ensuring cross-compiling won't be triggered when the `HOST`
variable is not set.
This commit is contained in:
Hennadii Stepanov 2024-08-04 23:08:26 +01:00
parent 99e041f86f
commit b28917be36
No known key found for this signature in database
GPG key ID: 410108112E7EA81F
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
depends/Makefile
View file

@ -51,7 +51,6 @@ C_STANDARD ?= c11
CXX_STANDARD ?= c++20 CXX_STANDARD ?= c++20
BUILD = $(shell ./config.guess) BUILD = $(shell ./config.guess)
HOST ?= $(BUILD)
PATCHES_PATH = $(BASEDIR)/patches PATCHES_PATH = $(BASEDIR)/patches
BASEDIR = $(CURDIR) BASEDIR = $(CURDIR)
HASH_LENGTH:=11 HASH_LENGTH:=11
@ -60,11 +59,6 @@ DOWNLOAD_RETRIES:=3
HOST_ID_SALT ?= salt HOST_ID_SALT ?= salt
BUILD_ID_SALT ?= salt BUILD_ID_SALT ?= salt
host:=$(BUILD)
ifneq ($(HOST),)
host:=$(HOST)
endif
ifneq ($(DEBUG),) ifneq ($(DEBUG),)
release_type=debug release_type=debug
else else
@ -74,9 +68,15 @@ endif
base_build_dir=$(WORK_PATH)/build base_build_dir=$(WORK_PATH)/build
base_staging_dir=$(WORK_PATH)/staging base_staging_dir=$(WORK_PATH)/staging
base_download_dir=$(WORK_PATH)/download base_download_dir=$(WORK_PATH)/download
canonical_host:=$(shell ./config.sub $(HOST))
build:=$(shell ./config.sub $(BUILD)) build:=$(shell ./config.sub $(BUILD))
host:=$(build)
ifneq ($(HOST),)
host:=$(HOST)
endif
HOST ?= $(BUILD)
canonical_host:=$(shell ./config.sub $(HOST))
build_arch =$(firstword $(subst -, ,$(build))) build_arch =$(firstword $(subst -, ,$(build)))
build_vendor=$(word 2,$(subst -, ,$(build))) build_vendor=$(word 2,$(subst -, ,$(build)))
full_build_os:=$(subst $(build_arch)-$(build_vendor)-,,$(build)) full_build_os:=$(subst $(build_arch)-$(build_vendor)-,,$(build))