diff options
| author | Carl Dong <contact@carldong.me> | 2021-01-07 00:26:31 -0500 |
|---|---|---|
| committer | Carl Dong <contact@carldong.me> | 2021-01-07 14:24:06 -0500 |
| commit | 949c480e527532be58d6184deb313d91339efdbf (patch) | |
| tree | 431c39f1ee01474ff0b6c73bfef2b0f47e652b84 /depends/Makefile | |
| parent | 880660acfa547558f6ef5adff6768de95e53af6e (diff) | |
| download | bitcoin-949c480e527532be58d6184deb313d91339efdbf.tar.xz | |
depends: Fully determine path for darwin cctools
See previous commit for description.
Diffstat (limited to 'depends/Makefile')
| -rw-r--r-- | depends/Makefile | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/depends/Makefile b/depends/Makefile index e0265973cb..6a4f268d66 100644 --- a/depends/Makefile +++ b/depends/Makefile @@ -166,8 +166,6 @@ $(host_arch)_$(host_os)_native_toolchain?=$($(host_os)_native_toolchain) include funcs.mk -binutils_path=$($($(host_arch)_$(host_os)_native_binutils)_prefixbin) - final_build_id_long+=$(shell $(build_SHA256SUM) config.site.in) final_build_id+=$(shell echo -n "$(final_build_id_long)" | $(build_SHA256SUM) | cut -c-$(HASH_LENGTH)) $(host_prefix)/.stamp_$(final_build_id): $(native_packages) $(packages) @@ -207,10 +205,10 @@ $(host_prefix)/share/config.site : config.site.in $(host_prefix)/.stamp_$(final_ $(AT)sed -e 's|@HOST@|$(host)|' \ -e 's|@CC@|$(host_CC)|' \ -e 's|@CXX@|$(host_CXX)|' \ - -e 's|@AR@|$(binutils_path)$(host_AR)|' \ - -e 's|@RANLIB@|$(binutils_path)$(host_RANLIB)|' \ - -e 's|@NM@|$(binutils_path)$(host_NM)|' \ - -e 's|@STRIP@|$(binutils_path)$(host_STRIP)|' \ + -e 's|@AR@|$(host_AR)|' \ + -e 's|@RANLIB@|$(host_RANLIB)|' \ + -e 's|@NM@|$(host_NM)|' \ + -e 's|@STRIP@|$(host_STRIP)|' \ -e 's|@build_os@|$(build_os)|' \ -e 's|@host_os@|$(host_os)|' \ -e 's|@CFLAGS@|$(strip $(host_CFLAGS) $(host_$(release_type)_CFLAGS))|' \ |