Skip to content

Commit 5ddd7c6

Browse files
hebastofanquake
authored andcommitted
build: Bump native_clang up to 17.0.6
1 parent 7524fcf commit 5ddd7c6

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

ci/test/00_setup_env_mac.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,4 @@ export XCODE_BUILD_ID=15A240d
1717
export RUN_UNIT_TESTS=false
1818
export RUN_FUNCTIONAL_TESTS=false
1919
export GOAL="deploy"
20-
21-
# False-positive warning is fixed with clang 17, remove this when that version
22-
# can be used.
23-
export BITCOIN_CONFIG="--with-gui --enable-reduce-exports LDFLAGS=-Wno-error=unused-command-line-argument"
20+
export BITCOIN_CONFIG="--with-gui --enable-reduce-exports"

depends/packages/native_clang.mk

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
package=native_clang
2-
$(package)_version=15.0.6
2+
$(package)_version=17.0.6
3+
$(package)_major_version=$(firstword $(subst ., ,$($(package)_version)))
34
$(package)_download_path=https://github.com/llvm/llvm-project/releases/download/llvmorg-$($(package)_version)
45
ifneq (,$(findstring aarch64,$(BUILD)))
56
$(package)_file_name=clang+llvm-$($(package)_version)-aarch64-linux-gnu.tar.xz
6-
$(package)_sha256_hash=8ca4d68cf103da8331ca3f35fe23d940c1b78fb7f0d4763c1c059e352f5d1bec
7+
$(package)_sha256_hash=6dd62762285326f223f40b8e4f2864b5c372de3f7de0731cb7cd55ca5287b75a
78
else
8-
$(package)_file_name=clang+llvm-$($(package)_version)-x86_64-linux-gnu-ubuntu-18.04.tar.xz
9-
$(package)_sha256_hash=38bc7f5563642e73e69ac5626724e206d6d539fbef653541b34cae0ba9c3f036
9+
$(package)_file_name=clang+llvm-$($(package)_version)-x86_64-linux-gnu-ubuntu-22.04.tar.xz
10+
$(package)_sha256_hash=884ee67d647d77e58740c1e645649e29ae9e8a6fe87c1376be0f3a30f3cc9ab3
1011
endif
1112

1213
define $(package)_stage_cmds
13-
mkdir -p $($(package)_staging_prefix_dir)/lib/clang/$($(package)_version)/include && \
14+
mkdir -p $($(package)_staging_prefix_dir)/lib/clang/$($(package)_major_version)/include && \
1415
mkdir -p $($(package)_staging_prefix_dir)/bin && \
1516
mkdir -p $($(package)_staging_prefix_dir)/include/llvm-c && \
1617
cp bin/clang $($(package)_staging_prefix_dir)/bin/ && \
@@ -20,5 +21,5 @@ define $(package)_stage_cmds
2021
cp include/llvm-c/ExternC.h $($(package)_staging_prefix_dir)/include/llvm-c && \
2122
cp include/llvm-c/lto.h $($(package)_staging_prefix_dir)/include/llvm-c && \
2223
cp lib/libLTO.so $($(package)_staging_prefix_dir)/lib/ && \
23-
cp -r lib/clang/$($(package)_version)/include/* $($(package)_staging_prefix_dir)/lib/clang/$($(package)_version)/include/
24+
cp -r lib/clang/$($(package)_major_version)/include/* $($(package)_staging_prefix_dir)/lib/clang/$($(package)_major_version)/include/
2425
endef

0 commit comments

Comments
 (0)