mirror of https://github.com/bitcoin/bitcoin
Merge 6cedf8a907
into a46065e36c
This commit is contained in:
commit
25a64948dc
|
@ -50,6 +50,13 @@ IGNORE_EXPORTS = {
|
|||
'stdout', 'stderr',
|
||||
}
|
||||
|
||||
# bitcoin-qt only
|
||||
IGNORE_EXPORTS.update({
|
||||
'xcb_xkb_id', 'xcb_xfixes_id', 'timezone', '__tzname', 'xcb_shm_id',
|
||||
'tzname', 'xcb_xinerama_id', '__timezone', 'xcb_render_id', 'xcb_shape_id',
|
||||
'xcb_randr_id', 'xcb_sync_id',
|
||||
})
|
||||
|
||||
# Expected linker-loader names can be found here:
|
||||
# https://sourceware.org/glibc/wiki/ABIList?action=recall&rev=16
|
||||
ELF_INTERPRETER_NAMES: dict[lief.ELF.ARCH, dict[lief.ENDIANNESS, str]] = {
|
||||
|
|
|
@ -200,7 +200,9 @@ make -C depends --jobs="$JOBS" HOST="$HOST" \
|
|||
x86_64_linux_RANLIB=x86_64-linux-gnu-gcc-ranlib \
|
||||
x86_64_linux_NM=x86_64-linux-gnu-gcc-nm \
|
||||
x86_64_linux_STRIP=x86_64-linux-gnu-strip \
|
||||
FORCE_USE_SYSTEM_CLANG=1
|
||||
FORCE_USE_SYSTEM_CLANG=1 \
|
||||
LTO=1 \
|
||||
CFLAGS="-flto" CXXFLAGS="-flto" LDFLAGS="-flto"
|
||||
|
||||
|
||||
###########################
|
||||
|
|
|
@ -51,7 +51,7 @@ fi
|
|||
time-machine() {
|
||||
# shellcheck disable=SC2086
|
||||
guix time-machine --url=https://git.savannah.gnu.org/git/guix.git \
|
||||
--commit=dc4842797bfdc5f9f3f5f725bf189c2b68bd6b5a \
|
||||
--commit=a8353e9d6b34fd8d42d2e8f14ce844849fe9c293 \
|
||||
--cores="$JOBS" \
|
||||
--keep-failed \
|
||||
--fallback \
|
||||
|
|
|
@ -91,7 +91,7 @@ chain for " target " development."))
|
|||
(home-page (package-home-page xgcc))
|
||||
(license (package-license xgcc)))))
|
||||
|
||||
(define base-gcc gcc-12)
|
||||
(define base-gcc gcc-13)
|
||||
(define base-linux-kernel-headers linux-libre-headers-6.1)
|
||||
|
||||
(define* (make-bitcoin-cross-toolchain target
|
||||
|
@ -517,21 +517,18 @@ inspecting signatures in Mach-O binaries.")
|
|||
python-lief)
|
||||
(let ((target (getenv "HOST")))
|
||||
(cond ((string-suffix? "-mingw32" target)
|
||||
(list ;; Native GCC 12 toolchain
|
||||
gcc-toolchain-12
|
||||
(list gcc-toolchain-13
|
||||
zip
|
||||
(make-mingw-pthreads-cross-toolchain "x86_64-w64-mingw32")
|
||||
nsis-x86_64
|
||||
nss-certs
|
||||
osslsigncode))
|
||||
((string-contains target "-linux-")
|
||||
(list ;; Native GCC 12 toolchain
|
||||
gcc-toolchain-12
|
||||
(list gcc-toolchain-12 "static")
|
||||
(list gcc-toolchain-13
|
||||
(list gcc-toolchain-13 "static")
|
||||
(make-bitcoin-cross-toolchain target)))
|
||||
((string-contains target "darwin")
|
||||
(list ;; Native GCC 11 toolchain
|
||||
gcc-toolchain-11
|
||||
(list gcc-toolchain-11
|
||||
binutils
|
||||
clang-toolchain-17
|
||||
python-signapple
|
||||
|
|
Loading…
Reference in New Issue