Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

backport: bump gcc and clang minimums; enforce c++20 #5971

Open
wants to merge 10 commits into
base: develop
Choose a base branch
from
Open

backport: bump gcc and clang minimums; enforce c++20 #5971

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3312d0b
partial Merge bitcoin/bitcoin#28348: build: Bump g++ minimum supporte…
fanquake Oct 30, 2023
0f87843
ci: use g++-10
PastaPastaPasta Oct 9, 2023
a1dc17d
Merge bitcoin/bitcoin#28337: build: use Clang 15 for macOS cross-comp…
fanquake Aug 27, 2023
bd2b9a6
Merge bitcoin/bitcoin#24460: build: update ax_cxx_compile_stdcxx to s…
fanquake Mar 4, 2022
13ea5c4
Merge bitcoin/bitcoin#28349: build: Require C++20 compiler
fanquake Dec 8, 2023
c854db4
fix: make sure we use version 10 of gcc
PastaPastaPasta Apr 9, 2024
b587dfe
ci: drop not unneeded cxx20 specific ci build
knst Apr 15, 2024
b26c957
fix: suppress deprecated-volatile in fuzz build
PastaPastaPasta Apr 23, 2024
6e95915
fix: resolve detection issue of c++20 when using g++10
PastaPastaPasta Apr 12, 2024
439f6d1
Merge bitcoin/bitcoin#27676: macOS: Bump minimum required runtime ver…
fanquake Jun 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/test/00_setup_env_mac.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export LC_ALL=C.UTF-8

export CONTAINER_NAME=ci_macos_cross
export HOST=x86_64-apple-darwin
export PACKAGES="cmake libz-dev libtinfo5 python3-setuptools"
export PACKAGES="cmake libz-dev python3-setuptools"
export XCODE_VERSION=12.2
export XCODE_BUILD_ID=12B45b
export RUN_UNIT_TESTS=false
Expand Down
2 changes: 1 addition & 1 deletion contrib/guix/manifest.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,5 +615,5 @@ parse, modify and abstract ELF, PE and MachO formats.")
((string-contains target "-linux-")
(list (make-bitcoin-cross-toolchain target)))
((string-contains target "darwin")
(list clang-toolchain-10 binutils cmake-minimal xorriso python-signapple))
(list clang-toolchain-15 binutils cmake-minimal xorriso python-signapple))
UdjinM6 marked this conversation as resolved.
Show resolved Hide resolved
UdjinM6 marked this conversation as resolved.
Show resolved Hide resolved
(else '())))))
2 changes: 1 addition & 1 deletion depends/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ The paths are automatically configured and no other options are needed unless ta

#### For macOS cross compilation

sudo apt-get install curl bsdmainutils cmake libz-dev python3-setuptools libtinfo5 xorriso
sudo apt-get install curl bsdmainutils cmake libz-dev python3-setuptools xorriso

Note: You must obtain the macOS SDK before proceeding with a cross-compile.
Under the depends directory, create a subdirectory named `SDKs`.
Expand Down
8 changes: 4 additions & 4 deletions depends/packages/native_clang.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package=native_clang
$(package)_version=10.0.1
$(package)_version=15.0.6
$(package)_download_path=https://github.com/llvm/llvm-project/releases/download/llvmorg-$($(package)_version)
ifneq (,$(findstring aarch64,$(BUILD)))
$(package)_file_name=clang+llvm-$($(package)_version)-aarch64-linux-gnu.tar.xz
$(package)_sha256_hash=90dc69a4758ca15cd0ffa45d07fbf5bf4309d47d2c7745a9f0735ecffde9c31f
$(package)_sha256_hash=8ca4d68cf103da8331ca3f35fe23d940c1b78fb7f0d4763c1c059e352f5d1bec
else
$(package)_file_name=clang+llvm-$($(package)_version)-x86_64-linux-gnu-ubuntu-16.04.tar.xz
$(package)_sha256_hash=48b83ef827ac2c213d5b64f5ad7ed082c8bcb712b46644e0dc5045c6f462c231
$(package)_file_name=clang+llvm-$($(package)_version)-x86_64-linux-gnu-ubuntu-18.04.tar.xz
$(package)_sha256_hash=38bc7f5563642e73e69ac5626724e206d6d539fbef653541b34cae0ba9c3f036
endif

define $(package)_preprocess_cmds
Expand Down